From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Uday S Reddy Newsgroups: gmane.emacs.devel Subject: Re: Please don't use revision numbers on commit messages (and elsewhere). Date: Fri, 1 Apr 2011 17:38:40 +0100 Message-ID: <19861.65424.828000.109632@gargle.gargle.HOWL> References: <877hbfvwyo.fsf@wanadoo.es> <87tyeivni1.fsf@wanadoo.es> <87ei5mvij7.fsf@uwakimon.sk.tsukuba.ac.jp> <87pqp6m2yg.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1301679717 22715 80.91.229.12 (1 Apr 2011 17:41:57 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 1 Apr 2011 17:41:57 +0000 (UTC) Cc: Uday S Reddy , emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 01 19:41:54 2011 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 1Q5iM4-0007rp-Qe for ged-emacs-devel@m.gmane.org; Fri, 01 Apr 2011 19:41:53 +0200 Original-Received: from localhost ([127.0.0.1]:48282 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q5hRS-0003he-IF for ged-emacs-devel@m.gmane.org; Fri, 01 Apr 2011 12:43:22 -0400 Original-Received: from [140.186.70.92] (port=52633 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q5hO9-0001oH-4V for emacs-devel@gnu.org; Fri, 01 Apr 2011 12:39:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q5hND-0004L2-Np for emacs-devel@gnu.org; Fri, 01 Apr 2011 12:39:00 -0400 Original-Received: from sun61.bham.ac.uk ([147.188.128.150]:48637) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q5hND-0004Kl-JG for emacs-devel@gnu.org; Fri, 01 Apr 2011 12:38:59 -0400 Original-Received: from [147.188.128.127] (helo=bham.ac.uk) by sun61.bham.ac.uk with esmtp (Exim 4.72) (envelope-from ) id 1Q5hNA-0002AA-Oq; Fri, 01 Apr 2011 17:38:56 +0100 Original-Received: from mx1.cs.bham.ac.uk ([147.188.192.53]) by bham.ac.uk (envelope-from ) with esmtps (TLSv1:DES-CBC3-SHA:168) (Exim 4.72) id 1Q5hNA-0007WA-Es using interface smart1.bham.ac.uk; Fri, 01 Apr 2011 17:38:56 +0100 Original-Received: from gromit.cs.bham.ac.uk ([147.188.193.16] helo=MARUTI.cs.bham.ac.uk) by mx1.cs.bham.ac.uk with esmtp (Exim 4.51) id 1Q5hN9-0007Hc-6D; Fri, 01 Apr 2011 17:38:55 +0100 In-Reply-To: <87pqp6m2yg.fsf@uwakimon.sk.tsukuba.ac.jp> X-Mailer: VM 8.1.93a under 23.3.1 (i386-mingw-nt5.1.2600) X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 147.188.128.150 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:138011 Archived-At: Stephen J. Turnbull writes: > Right now, you and I simultaneously clone the mainline at r42. You > commit, creating r43, because as far as bzr knows, you're on the > mainline. Oops, you missed something, and you commit your r44, with > the message "Fix bug introduced in r43." While you're fixing the bug, > I commit and push, and my commit becomes mainline r43. Now when you > pull and merge, your commits that used to be on the (local) mainline > with revnos r43 and r44 are now off the mainline and have revnos > r42.1.1 and r42.1.2, and the commit message is now a dastardly attack > on my reputation. ;-) Not really. Since r43 is a reference to a revision _local_ to the merged branch, it is easy to interpret it as a reference to 42.1.1. I already have a few such references in the VM mainline and they haven't posed a problem. What happens when there are multiple mainlines or when you cherry pick revisions into another release branch, I am not sure. Cheers, Uday