From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: New branch Date: Thu, 28 Jan 2010 17:53:46 -0500 Message-ID: References: <87aavyt3u1.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1264719292 29713 80.91.229.12 (28 Jan 2010 22:54:52 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 Jan 2010 22:54:52 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?iso-8859-1?Q?=D3scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 28 23:54:49 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 1NadGC-0008Ng-GQ for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2010 23:54:48 +0100 Original-Received: from localhost ([127.0.0.1]:49059 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NadGC-0002fu-3G for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2010 17:54:48 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NadFJ-0002DG-Rv for emacs-devel@gnu.org; Thu, 28 Jan 2010 17:53:53 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NadFF-00029v-D5 for emacs-devel@gnu.org; Thu, 28 Jan 2010 17:53:53 -0500 Original-Received: from [199.232.76.173] (port=33727 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NadFF-00029p-5D for emacs-devel@gnu.org; Thu, 28 Jan 2010 17:53:49 -0500 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:36247) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NadFE-00022T-Id for emacs-devel@gnu.org; Thu, 28 Jan 2010 17:53:48 -0500 Original-Received: from faina.iro.umontreal.ca (faina.iro.umontreal.ca [132.204.26.177]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id o0SMrkIM021265; Thu, 28 Jan 2010 17:53:46 -0500 Original-Received: by faina.iro.umontreal.ca (Postfix, from userid 20848) id 60C033A7A3; Thu, 28 Jan 2010 17:53:46 -0500 (EST) In-Reply-To: <87aavyt3u1.fsf@telefonica.net> (=?iso-8859-1?Q?=22=D3scar?= Fuentes"'s message of "Thu, 28 Jan 2010 20:41:10 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV3458=0 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:120619 Archived-At: > ... 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. trunk wouldn't take the role of the pending branch: it would take the content of the pending branch but keep its role of "where development is focused", so I don't think there's any problem. It matches previous CVS pratice in this regard. > 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. When I tried to do that, I bumped into the problem that I can't have a symlink "trunk" pointing to the "emacs-23" branch (because bzr.sv.gnu.org's http server doesn't honor symlinks). Stefan