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: New branch Date: Thu, 28 Jan 2010 20:41:10 +0100 Message-ID: <87aavyt3u1.fsf@telefonica.net> References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1264707885 20456 80.91.229.12 (28 Jan 2010 19:44:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 Jan 2010 19:44:45 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 28 20:44:40 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 1NaaI9-0002pv-AS for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2010 20:44:37 +0100 Original-Received: from localhost ([127.0.0.1]:52804 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaaI8-0006no-Mm for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2010 14:44:36 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NaaFV-0004mR-7m for emacs-devel@gnu.org; Thu, 28 Jan 2010 14:41:53 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NaaFQ-0004jg-HO for emacs-devel@gnu.org; Thu, 28 Jan 2010 14:41:52 -0500 Original-Received: from [199.232.76.173] (port=58142 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaaFQ-0004jb-Cx for emacs-devel@gnu.org; Thu, 28 Jan 2010 14:41:48 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:57942) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NaaFP-0003xx-Vv for emacs-devel@gnu.org; Thu, 28 Jan 2010 14:41:48 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1NaaFG-0000ly-Co for emacs-devel@gnu.org; Thu, 28 Jan 2010 20:41:38 +0100 Original-Received: from 92.red-88-24-231.staticip.rima-tde.net ([88.24.231.92]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 28 Jan 2010 20:41:38 +0100 Original-Received: from ofv by 92.red-88-24-231.staticip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 28 Jan 2010 20:41:38 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 43 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 92.red-88-24-231.staticip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) Cancel-Lock: sha1:lZJ9VH+nOc2EuvwKWFwpnBeLK7o= X-detected-operating-system: by monty-python.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:120609 Archived-At: Stefan Monnier writes: > That could be, tho I haven't thought much about it yet. > But note that in the context of Bzr, those questions don't have the same > importance&meaning as within CVS. After all, creating a branch is > nothing else than cloning, so initially the new branch is absolutely > identical to the "parent". This is correct. But you have to think too about the branches out there that are pointing to upstream branches... > I expect at some point we'll do something like: > > (cd pending; bzr merge ../trunk; bzr commit) > mv trunk emacs-23.2 > mv pending trunk > > or maybe > > bzr clone trunk emacs-23.2 > (cd trunk; bzr merge ../pending; bzr commit) > rm -rf pending ... for the people that at that time have branches of `trunk' and `pending', if they do not adjust their reference branches to match the change, they can get confused: the lesser problem is the disappearance of `pending', which it is just an annoyance, but `trunk' suddendly taking the role of the former `pending' branch can be a bit disturbing, as you are switching roles, and if someone does not notice it, he can commit to the "new" `trunk' something intended for the "old" trunk. I don't know if Emacs hackers are up to date enough with notices on the ml to be aware of the transition. In any case, people would have to do a bit of housekeeping when you rename a branch. In the future, I suggest creating branches with a name that conveys its purpose (trunk can be the perennial development branch, then we would have `emacs-XX.X', etc) and keep those names forever. This requires almost no housekeeping on the developers part, except for cloning emacs-XX.X when it is created, which is much simpler than adjusting branch references.