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: Please don't use revision numbers on commit messages (and elsewhere). Date: Sat, 02 Apr 2011 15:47:54 +0200 Message-ID: <87hbagsr1x.fsf@wanadoo.es> References: <877hbfvwyo.fsf@wanadoo.es> <87sju2hoee.fsf@ambire.localdomain> <87pqp6vn3p.fsf@wanadoo.es> <874o6iicxp.fsf@ambire.localdomain> <83mxkapb2g.fsf@gnu.org> <87zkoat20x.fsf@wanadoo.es> <83liztyeed.fsf@gnu.org> <87ipuxu3hb.fsf@wanadoo.es> <87aag9tt7e.fsf@wanadoo.es> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1301752101 16944 80.91.229.12 (2 Apr 2011 13:48:21 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 2 Apr 2011 13:48:21 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 02 15:48:17 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 1Q61BY-0006vs-IV for ged-emacs-devel@m.gmane.org; Sat, 02 Apr 2011 15:48:17 +0200 Original-Received: from localhost ([127.0.0.1]:54312 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q61BX-0000x6-VO for ged-emacs-devel@m.gmane.org; Sat, 02 Apr 2011 09:48:16 -0400 Original-Received: from [140.186.70.92] (port=54918 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q61BS-0000x1-Vv for emacs-devel@gnu.org; Sat, 02 Apr 2011 09:48:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q61BR-0000d0-DQ for emacs-devel@gnu.org; Sat, 02 Apr 2011 09:48:10 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:42215) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q61BR-0000cX-01 for emacs-devel@gnu.org; Sat, 02 Apr 2011 09:48:09 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1Q61BP-0006Va-Et for emacs-devel@gnu.org; Sat, 02 Apr 2011 15:48:07 +0200 Original-Received: from 131.red-83-59-5.dynamicip.rima-tde.net ([83.59.5.131]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 02 Apr 2011 15:48:07 +0200 Original-Received: from ofv by 131.red-83-59-5.dynamicip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 02 Apr 2011 15:48:07 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 48 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 131.red-83-59-5.dynamicip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) Cancel-Lock: sha1:iIrcIkQvPqpV8Sbd6n/Tq+o1CtA= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 80.91.229.12 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:138059 Archived-At: Uday S Reddy writes: > No, the trunk really looks like this: > > 16 merge uday's awesome feature into trunk > 10.1.2 Fix bug introduced on revision 11 > 10.1.1 Implement awesome feature > 15 someone else's changes > 14 someone else's changes > 13 someone else's changes > 12 someone else's changes > 11 someone else's changes > 10 someone else's changes You are right. [snip] > The branch-local-revision is the localized version of the revision > number, i.e., 1 = 11-10, 2 = 12-10, ... > > So, doing that bit of arithmetic is all it takes to decode "revision 11". Yes, that works as long as those commits are merged in the same operation. But even on that case we would be better without the arithmetic. Think a feature branch with dozens or hundreds of commits. And I'm not talking just about commit messages. References on bug reports or e-mail exchanges suffer from the same. [snip] >> 3. If you are inspecting the VC history on a branch and wish to see >> where certain commit with revno X mentioned on a commit message, bug >> report, etc fits on the context of your branch, you must go out of >> your way to look up on trunk the revid of X. > > All you would need is your branch's history. I don't understand what > you would find on the trunk that you don't have in your branch's log > already. My branch log doesn't show the revnos of trunk as they are on trunk, but some renumbered version. As you mention, I can start counting merged revisions across merge points until reaching the referenced revision, but that's impractical. [snip]