From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: Locks on the Bzr repository Date: Sat, 21 Aug 2010 15:45:46 +0200 Message-ID: <87sk286pv9.fsf@telefonica.net> References: <4C6D56DB.7040703@swipnet.se> <4C6D8EC5.7040901@swipnet.se> <4C6E1F0A.7070506@swipnet.se> <837hjlr78p.fsf@gnu.org> <87zkwhtws5.fsf@uwakimon.sk.tsukuba.ac.jp> <83tymppj62.fsf@gnu.org> <871v9t8klf.fsf@uwakimon.sk.tsukuba.ac.jp> <83lj81pazq.fsf@gnu.org> <83aaogpcbu.fsf@gnu.org> <19567.50977.609000.549262@gargle.gargle.HOWL> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1282398366 21306 80.91.229.12 (21 Aug 2010 13:46:06 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 21 Aug 2010 13:46:06 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Aug 21 15:46:06 2010 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.69) (envelope-from ) id 1OmoOb-0002sO-7h for ged-emacs-devel@m.gmane.org; Sat, 21 Aug 2010 15:46:05 +0200 Original-Received: from localhost ([127.0.0.1]:49438 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OmoOa-0003l3-Jg for ged-emacs-devel@m.gmane.org; Sat, 21 Aug 2010 09:46:04 -0400 Original-Received: from [140.186.70.92] (port=50921 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OmoOV-0003jv-1P for emacs-devel@gnu.org; Sat, 21 Aug 2010 09:46:00 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OmoOT-0004P1-SM for emacs-devel@gnu.org; Sat, 21 Aug 2010 09:45:58 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:54571) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OmoOT-0004Os-Lg for emacs-devel@gnu.org; Sat, 21 Aug 2010 09:45:57 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1OmoOR-0002oS-Ua for emacs-devel@gnu.org; Sat, 21 Aug 2010 15:45:55 +0200 Original-Received: from 83.42.13.171 ([83.42.13.171]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 21 Aug 2010 15:45:55 +0200 Original-Received: from ofv by 83.42.13.171 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 21 Aug 2010 15:45:55 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 26 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 83.42.13.171 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) Cancel-Lock: sha1:fYxq5FWeJxNO7FP3JrsttXLFwTY= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) 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:128962 Archived-At: Uday S Reddy writes: [snip] > It seems to me that the closeness to the previous workflow using CVS > was perhaps the overriding criterion for the authors of the > recommended workflow. The technical merits and demerits were probably > not at the top of the scale. Not really (for the workflow advertised by Stephen and Karl.) At the time (and possibly still now) rebasing was not the soundest part of bzr. So the remaining workflows were "merge+push" and "pull". "merge+push" have the serious inconveniences described on my other post on this thread. So Stephen went for the remaining one: "pull", which is simulated with bound branches. When a developer does "merge+commit" on his local branch bound to upstream, it is the equivalent of `pull' on the remote branch. > Having always used unbounded branches, I came into this discussion > wanting to learn why bound branches are being used by you guys. I > still don't know why. But I can see that it makes you feel a lot more > comfortable. It is not about confort, but about the lesser evil while working with bzr.