From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Wolfgang Jenkner Newsgroups: gmane.emacs.devel Subject: Re: participation & contribution [was: Latest changes with lisp/uni-*.el and leim/quail] Date: Tue, 03 Dec 2013 21:03:13 +0100 Message-ID: <857gblofu0.fsf@iznogoud.viz> References: <83txew8m9v.fsf@gnu.org> <466a2599-43b3-4406-8bad-22cfb49c364f@default> <877gbp116q.fsf@zigzag.favinet> <1494374.2rpVF7jNgB@descartes> <87eh5uqka9.fsf@zigzag.favinet> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1386101480 6688 80.91.229.3 (3 Dec 2013 20:11:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 3 Dec 2013 20:11:20 +0000 (UTC) Cc: Felipe Contreras Garza To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Dec 03 21:11:24 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VnwJV-0007q2-KZ for ged-emacs-devel@m.gmane.org; Tue, 03 Dec 2013 21:11:21 +0100 Original-Received: from localhost ([::1]:44670 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnwJU-0004uU-Ti for ged-emacs-devel@m.gmane.org; Tue, 03 Dec 2013 15:11:20 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41709) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnwJN-0004tK-PA for emacs-devel@gnu.org; Tue, 03 Dec 2013 15:11:19 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VnwJH-0007cB-Nd for emacs-devel@gnu.org; Tue, 03 Dec 2013 15:11:13 -0500 Original-Received: from b2bfep14.mx.upcmail.net ([62.179.121.59]:35376) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnwJH-0007by-DX for emacs-devel@gnu.org; Tue, 03 Dec 2013 15:11:07 -0500 Original-Received: from edge11.upcmail.net ([192.168.13.81]) by b2bfep14-int.chello.at (InterMail vM.8.01.05.11 201-2260-151-128-20120928) with ESMTP id <20131203201104.WNGH12006.b2bfep14-int.chello.at@edge11.upcmail.net>; Tue, 3 Dec 2013 21:11:04 +0100 Original-Received: from iznogoud.viz ([91.119.87.179]) by edge11.upcmail.net with edge id x8B31m01B3s9skB0B8B4c7; Tue, 03 Dec 2013 21:11:04 +0100 X-SourceIP: 91.119.87.179 Original-Received: from wolfgang by iznogoud.viz with local (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1VnwJD-0000Lk-Np; Tue, 03 Dec 2013 21:11:03 +0100 Mail-Followup-To: emacs-devel@gnu.org, Felipe Contreras Garza User-Agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.3.50 (berkeley-unix) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 62.179.121.59 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:166052 Archived-At: On Tue, Dec 03 2013, Thien-Thi Nguyen wrote: > () R=C3=BCdiger Sonderfeld > () Mon, 02 Dec 2013 14:29:53 +0100 > Is anybody here using git-bzr to push to the Emacs master? > > Soon that would be me (and you, right?), and hopefully OP... > > How well does this work? > > Why don't you try it and post your observations? That's what i will do. Like other people I have done some experiments with local repositories and there is a thing that bothers me: While, by default, `git push' to some other git repo succeeds only if this would not change the history of what is already in that repo, there is apparently no such safeguard against rewriting history in an upstream bzr repo (and pushing to a bound branch instead does not quite work). The stuff below corresponds to "NOTE ABOUT FAST-FORWARDS" in git-push(1). [1 /tmp]$ bzr init trunk Created a standalone tree (format: 2a) [2 /tmp]$ (cd trunk && touch foo && bzr add $_ && bzr commit -m X && bzr lo= g --line) adding foo Committing to: /tmp/trunk/ added foo Committed revision 1. 1: Wolfgang Jenkner 2013-12-02 X [3 /tmp]$ git clone bzr::trunk local Cloning into 'local'... Checking connectivity... done [4 /tmp]$ (cd trunk && echo "trunk change" >foo && bzr commit -m A && bzr l= og --line)=20 Committing to: /tmp/trunk/ modified foo Committed revision 2. 2: Wolfgang Jenkner 2013-12-02 A 1: Wolfgang Jenkner 2013-12-02 X [5 /tmp]$ (cd local && echo "local change" >foo && git commit -a -m B && gi= t log --oneline && git push)=20 [master 8b5e5ad] B 1 file changed, 1 insertion(+) 8b5e5ad B ad0e090 X Text conflict in foo 1 conflicts encountered. To bzr::/tmp/trunk ad0e090..8b5e5ad master -> master [6 /tmp]$ (cd trunk && bzr log --line) 2: Wolfgang Jenkner 2013-12-02 B 1: Wolfgang Jenkner 2013-12-02 X [7 /tmp]$ ls -l trunk total 12 -rw-r--r-- 1 wolfgang wheel 68 Dec 2 16:52 foo -rw-r--r-- 1 wolfgang wheel 0 Dec 2 16:52 foo.BASE -rw-r--r-- 1 wolfgang wheel 13 Dec 2 16:52 foo.OTHER -rw-r--r-- 1 wolfgang wheel 13 Dec 2 16:52 foo.THIS [8 /tmp]$ cat trunk/foo <<<<<<< TREE trunk change =3D=3D=3D=3D=3D=3D=3D local change >>>>>>> MERGE-SOURCE [9 /tmp]$ cat local/foo local change [10 /tmp]$ (cd local && git pull) Already up-to-date. [11 /tmp]$ git clone bzr::trunk new-local Cloning into 'new-local'... Checking connectivity... done [12 /tmp]$ cat new-local/foo local change [13 /tmp]$ (cd trunk && bzr status) modified: foo unknown: foo.BASE foo.OTHER foo.THIS conflicts: Text conflict in foo [14 /tmp]$=20