From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David De La Harpe Golden Newsgroups: gmane.emacs.devel Subject: Re: bzr repository ready? Date: Tue, 24 Nov 2009 23:41:13 +0000 Message-ID: <4B0C6F19.4000200@harpegolden.net> References: <20091118230952.GB908@muc.de> <87my2jw05z.fsf@red-bean.com> <83skc9pbf7.fsf@gnu.org> <87iqd5vw5n.fsf@red-bean.com> <877htl53tc.fsf@telefonica.net> <87ws1ku7zd.fsf@red-bean.com> <87hbso4s13.fsf@telefonica.net> <83aaygoy90.fsf@gnu.org> <87vdh36d48.fsf@telefonica.net> <831vjrptha.fsf@gnu.org> <87einr63b6.fsf@telefonica.net> <83y6lzo9e7.fsf@gnu.org> <871vjr750o.fsf@uwakimon.sk.tsukuba.ac.jp> <87zl6fnnu2.fsf@notengoamigos.org> <87aaye3nba.fsf@uwakimon.sk.tsukuba.ac.jp> <87r5rqm7gm.fsf@notengoamigos.org> <87skc5spso.fsf@uwakimon.sk.tsukuba.ac.jp> <87ws1hujh5.fsf@notengoamigos.org> <4B0B1DA6.7030206@harpegolden.net> <87k4xgrdsl.fsf@canonical.com> <4B0B34AF.20400@harpegolden.net> <87my2cptji.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1259106145 4324 80.91.229.12 (24 Nov 2009 23:42:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 24 Nov 2009 23:42:25 +0000 (UTC) Cc: es , Eli Zaretskii , Karl Fogel , Jason Earl , emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 25 00:42:17 2009 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1ND51T-0003nw-5Y for ged-emacs-devel@m.gmane.org; Wed, 25 Nov 2009 00:42:15 +0100 Original-Received: from localhost ([127.0.0.1]:38183 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ND51S-0004xH-RI for ged-emacs-devel@m.gmane.org; Tue, 24 Nov 2009 18:42:14 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1ND50f-0004V4-6r for emacs-devel@gnu.org; Tue, 24 Nov 2009 18:41:25 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1ND50a-0004RX-Gi for emacs-devel@gnu.org; Tue, 24 Nov 2009 18:41:24 -0500 Original-Received: from [199.232.76.173] (port=49064 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ND50a-0004R5-85 for emacs-devel@gnu.org; Tue, 24 Nov 2009 18:41:20 -0500 Original-Received: from harpegolden.net ([65.99.215.13]:56089) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1ND50Y-000678-AQ; Tue, 24 Nov 2009 18:41:18 -0500 Original-Received: from [87.198.54.205] (87-198-54-205.ptr.magnet.ie [87.198.54.205]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "David De La Harpe Golden", Issuer "David De La Harpe Golden Personal CA rev 3" (verified OK)) by harpegolden.net (Postfix) with ESMTP id 3B1148428; Tue, 24 Nov 2009 23:41:16 +0000 (GMT) User-Agent: Mozilla-Thunderbird 2.0.0.22 (X11/20091109) In-Reply-To: <87my2cptji.fsf@uwakimon.sk.tsukuba.ac.jp> X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:117718 Archived-At: Thanks for the reply! > In the recommended workflow in BzrForEmacsDevs, "trunk" is precisely a > manually-maintained remote tracking branch. Right so. > You don't commit any local changes, because you didn't make any in > that branch. You *merge* local changes to it from your working > branch, well, to the working tree of branch trunk, not to the branch as such? > and these are *automatically* passed on to the upstream master > when you commit. So hybrid of D and non-D VCS. I suppose that's why "bound branch" was "checkout", it was by an analogy to non-D VCS where a cvs commit goes off to the remote server. What happens when you commit "on" a bound branch without network connectivity? I guess it just fails, since you're not really committing to the bound branch but rather to the associated remote upstream branch? > Because it's pointless to do that. The race condition in using > my-trunk (not bound to upstream master) means that you can succeed in > committing the merge, but fail the push. Well, I suppose in the git world one just tends to avoid many committers in the first place (since given DVCS there's no actual need for much shared access beyond perhaps some redundancy), and the occasional conflict isn't the end of the world. Maybe it's easier to rewrite history in git though, I know nothing of bzr (though I did just find bzr rebase)