From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: esr@thyrsus.com (Eric S. Raymond) Newsgroups: gmane.emacs.devel Subject: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sat, 1 Mar 2014 12:13:37 -0500 (EST) Message-ID: <20140301171337.53CC638073E@snark.thyrsus.com> NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1393694059 475 80.91.229.3 (1 Mar 2014 17:14:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 1 Mar 2014 17:14:19 +0000 (UTC) To: emacs-devel@gnu.org, handa@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Mar 01 18:14:28 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WJnUZ-0008HS-S0 for ged-emacs-devel@m.gmane.org; Sat, 01 Mar 2014 18:14:27 +0100 Original-Received: from localhost ([::1]:60364 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJnUZ-0000UJ-E5 for ged-emacs-devel@m.gmane.org; Sat, 01 Mar 2014 12:14:27 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59679) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJnUS-0000Ow-CI for emacs-devel@gnu.org; Sat, 01 Mar 2014 12:14:24 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WJnUK-000303-FA for emacs-devel@gnu.org; Sat, 01 Mar 2014 12:14:20 -0500 Original-Received: from static-71-162-243-5.phlapa.fios.verizon.net ([71.162.243.5]:33013 helo=snark.thyrsus.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJnUK-0002zt-Bq; Sat, 01 Mar 2014 12:14:12 -0500 Original-Received: by snark.thyrsus.com (Postfix, from userid 1000) id 53CC638073E; Sat, 1 Mar 2014 12:13:37 -0500 (EST) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 71.162.243.5 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170005 Archived-At: Here's the context: revno: 111954.1.4 committer: K. Handa branch nick: work timestamp: Fri 2013-03-22 00:18:44 +0900 message: Fix a bug introduced by revno:111954.1.97 It doesn't show up in a bzr log --levels=0 listing, and the fact that 97 > 4 suggests the reference is garbled. -- Eric S. Raymond "Those who make peaceful revolution impossible will make violent revolution inevitable." -- John F. Kennedy From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sat, 01 Mar 2014 20:24:33 +0200 Message-ID: <8338j1vkta.fsf@gnu.org> References: <20140301171337.53CC638073E@snark.thyrsus.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1393698289 12444 80.91.229.3 (1 Mar 2014 18:24:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 1 Mar 2014 18:24:49 +0000 (UTC) Cc: handa@gnu.org, emacs-devel@gnu.org To: esr@thyrsus.com (Eric S. Raymond) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Mar 01 19:24:57 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WJoal-0003Gm-As for ged-emacs-devel@m.gmane.org; Sat, 01 Mar 2014 19:24:55 +0100 Original-Received: from localhost ([::1]:60541 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJoak-0000Xu-TZ for ged-emacs-devel@m.gmane.org; Sat, 01 Mar 2014 13:24:54 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42295) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJoad-0000Rp-Qx for emacs-devel@gnu.org; Sat, 01 Mar 2014 13:24:53 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WJoaX-0000pt-Rf for emacs-devel@gnu.org; Sat, 01 Mar 2014 13:24:47 -0500 Original-Received: from mtaout27.012.net.il ([80.179.55.183]:34894) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJoaX-0000pf-K7; Sat, 01 Mar 2014 13:24:41 -0500 Original-Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0N1R00600RWLIR00@mtaout27.012.net.il>; Sat, 01 Mar 2014 20:22:36 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N1R0022USDODW60@mtaout27.012.net.il>; Sat, 01 Mar 2014 20:22:36 +0200 (IST) In-reply-to: <20140301171337.53CC638073E@snark.thyrsus.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.183 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170010 Archived-At: > From: esr@thyrsus.com (Eric S. Raymond) > Date: Sat, 1 Mar 2014 12:13:37 -0500 (EST) > > Here's the context: > > revno: 111954.1.4 > committer: K. Handa > branch nick: work > timestamp: Fri 2013-03-22 00:18:44 +0900 > message: > Fix a bug introduced by revno:111954.1.97 > > It doesn't show up in a bzr log --levels=0 listing, and the fact that > 97 > 4 suggests the reference is garbled. I think the correct reference is 111964.1.6. It was merged in r112051. From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Eric S. Raymond" Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sat, 1 Mar 2014 13:43:03 -0500 Organization: Eric Conspiracy Secret Labs Message-ID: <20140301184303.GA15611@thyrsus.com> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> Reply-To: esr@thyrsus.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1393699391 22985 80.91.229.3 (1 Mar 2014 18:43:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 1 Mar 2014 18:43:11 +0000 (UTC) Cc: handa@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Mar 01 19:43:20 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WJosa-0001fi-3e for ged-emacs-devel@m.gmane.org; Sat, 01 Mar 2014 19:43:20 +0100 Original-Received: from localhost ([::1]:60569 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJosZ-0006kv-PU for ged-emacs-devel@m.gmane.org; Sat, 01 Mar 2014 13:43:19 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJosT-0006kP-8i for emacs-devel@gnu.org; Sat, 01 Mar 2014 13:43:17 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WJosP-0006LL-18 for emacs-devel@gnu.org; Sat, 01 Mar 2014 13:43:13 -0500 Original-Received: from static-71-162-243-5.phlapa.fios.verizon.net ([71.162.243.5]:33645 helo=snark.thyrsus.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJosK-0006Kc-7O; Sat, 01 Mar 2014 13:43:04 -0500 Original-Received: by snark.thyrsus.com (Postfix, from userid 1000) id 8293338073E; Sat, 1 Mar 2014 13:43:03 -0500 (EST) Content-Disposition: inline In-Reply-To: <8338j1vkta.fsf@gnu.org> X-Eric-Conspiracy: There is no conspiracy User-Agent: Mutt/1.5.21 (2010-09-15) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 71.162.243.5 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170011 Archived-At: Eli Zaretskii : > I think the correct reference is 111964.1.6. It was merged in > r112051. Thanks. That almost finishes the list of comment references to be fixed up. -- Eric S. Raymond From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Joshua Judson Rosen Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sat, 01 Mar 2014 16:35:35 -0500 Message-ID: <87fvn17gbc.fsf@slice.rozzin.com> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1393709745 31357 80.91.229.3 (1 Mar 2014 21:35:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 1 Mar 2014 21:35:45 +0000 (UTC) Cc: "Eric S. Raymond" , handa@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Mar 01 22:35:53 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WJrZY-0002CW-Pt for ged-emacs-devel@m.gmane.org; Sat, 01 Mar 2014 22:35:52 +0100 Original-Received: from localhost ([::1]:60936 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJrZY-0001Lu-Do for ged-emacs-devel@m.gmane.org; Sat, 01 Mar 2014 16:35:52 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46972) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJrZR-0001LU-Q1 for emacs-devel@gnu.org; Sat, 01 Mar 2014 16:35:50 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WJrZN-0000s5-BY for emacs-devel@gnu.org; Sat, 01 Mar 2014 16:35:45 -0500 Original-Received: from 209-20-69-211.slicehost.net ([209.20.69.211]:51003 helo=slice.rozzin.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJrZI-0000qz-CJ; Sat, 01 Mar 2014 16:35:36 -0500 Original-Received: by slice.rozzin.com (Postfix, from userid 1000) id 33FF1C85F2; Sat, 1 Mar 2014 16:35:35 -0500 (EST) In-Reply-To: <8338j1vkta.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 01 Mar 2014 20:24:33 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 209.20.69.211 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170030 Archived-At: Eli Zaretskii writes: > > > From: esr@thyrsus.com (Eric S. Raymond) > > Date: Sat, 1 Mar 2014 12:13:37 -0500 (EST) > > > > Here's the context: > > > > revno: 111954.1.4 > > committer: K. Handa > > branch nick: work > > timestamp: Fri 2013-03-22 00:18:44 +0900 > > message: > > Fix a bug introduced by revno:111954.1.97 > > > > It doesn't show up in a bzr log --levels=0 listing, and the fact that > > 97 > 4 suggests the reference is garbled. > > I think the correct reference is 111964.1.6. It was merged in > r112051. ... and the "revno:111954.1.97" was a reference to trunk revno:112051. The fact that the commit whose comment is making that reference is itself from a non-mainline branch suggests that the reference may actually not be garbled, but rather be from an obsolete context. The "111954.1.97" revno is actually correct relative to the "111954.1.4" commit and Handa's "work branch" (where it would have been 111954+4=11958; if you do "bzr branch trunk -r 111954.1.4 handa-work" and then do "bzr log -r 111954.1.97 --show-ids handa-work", this starts to become clear). (for the git people who are probably having a major WTF at this: it's perhaps on par with abbreviating git sha1sums down to just the first few hexits) -- "'tis an ill wind that blows no minds." From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Eric S. Raymond" Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sat, 1 Mar 2014 17:02:07 -0500 Organization: Eric Conspiracy Secret Labs Message-ID: <20140301220207.GC19461@thyrsus.com> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> <87fvn17gbc.fsf@slice.rozzin.com> Reply-To: esr@thyrsus.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1393711336 14611 80.91.229.3 (1 Mar 2014 22:02:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 1 Mar 2014 22:02:16 +0000 (UTC) Cc: handa@gnu.org, Eli Zaretskii , emacs-devel@gnu.org To: Joshua Judson Rosen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Mar 01 23:02:25 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WJrzD-0002TW-K3 for ged-emacs-devel@m.gmane.org; Sat, 01 Mar 2014 23:02:23 +0100 Original-Received: from localhost ([::1]:60980 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJrzD-0001WO-15 for ged-emacs-devel@m.gmane.org; Sat, 01 Mar 2014 17:02:23 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51086) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJrz6-0001Va-LQ for emacs-devel@gnu.org; Sat, 01 Mar 2014 17:02:20 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WJrz2-0000OV-Jt for emacs-devel@gnu.org; Sat, 01 Mar 2014 17:02:16 -0500 Original-Received: from static-71-162-243-5.phlapa.fios.verizon.net ([71.162.243.5]:34362 helo=snark.thyrsus.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJryy-0000MW-14; Sat, 01 Mar 2014 17:02:08 -0500 Original-Received: by snark.thyrsus.com (Postfix, from userid 1000) id 5FD8138073E; Sat, 1 Mar 2014 17:02:07 -0500 (EST) Content-Disposition: inline In-Reply-To: <87fvn17gbc.fsf@slice.rozzin.com> X-Eric-Conspiracy: There is no conspiracy User-Agent: Mutt/1.5.21 (2010-09-15) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 71.162.243.5 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170033 Archived-At: Joshua Judson Rosen : > > I think the correct reference is 111964.1.6. It was merged in > > r112051. > > ... and the "revno:111954.1.97" was a reference to trunk revno:112051. > > The fact that the commit whose comment is making that reference is itself > from a non-mainline branch suggests that the reference may actually > not be garbled, but rather be from an obsolete context. > > The "111954.1.97" revno is actually correct relative to the "111954.1.4" > commit and Handa's "work branch" (where it would have been 111954+4=11958; > if you do "bzr branch trunk -r 111954.1.4 handa-work" and then do > "bzr log -r 111954.1.97 --show-ids handa-work", this starts to become clear). Oh, crap. Now I'm confused about what to replace that revno with. The alternatives are: 111964.1.6 2013-03-15T16:03:54Z!handa@gnu.org 112051 2013-03-15T16:06:12Z!handa@gnu.org It's only a difference in timestamp. Do they have the same content? If not, serious can of worms. If so, the qustion of which timestamp to consider authoritative becomes more philosophical. -- Eric S. Raymond From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Joshua Judson Rosen Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sat, 01 Mar 2014 22:47:52 -0500 Message-ID: <87eh2l5kif.fsf@slice.rozzin.com> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> <87fvn17gbc.fsf@slice.rozzin.com> <20140301220207.GC19461@thyrsus.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1393732083 11104 80.91.229.3 (2 Mar 2014 03:48:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Mar 2014 03:48:03 +0000 (UTC) Cc: handa@gnu.org, Eli Zaretskii , emacs-devel@gnu.org To: esr@thyrsus.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 02 04:48:11 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WJxNq-0001jJ-QU for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 04:48:10 +0100 Original-Received: from localhost ([::1]:34346 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJxNq-0000k9-G3 for ged-emacs-devel@m.gmane.org; Sat, 01 Mar 2014 22:48:10 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45612) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJxNj-0000jo-Uz for emacs-devel@gnu.org; Sat, 01 Mar 2014 22:48:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WJxNe-000837-Rw for emacs-devel@gnu.org; Sat, 01 Mar 2014 22:48:03 -0500 Original-Received: from 209-20-69-211.slicehost.net ([209.20.69.211]:45669 helo=slice.rozzin.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJxNY-00081e-V1; Sat, 01 Mar 2014 22:47:53 -0500 Original-Received: by slice.rozzin.com (Postfix, from userid 1000) id 57D3CC85D4; Sat, 1 Mar 2014 22:47:52 -0500 (EST) In-Reply-To: <20140301220207.GC19461@thyrsus.com> (Eric S. Raymond's message of "Sat, 1 Mar 2014 17:02:07 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 209.20.69.211 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170040 Archived-At: "Eric S. Raymond" writes: > > Oh, crap. Now I'm confused about what to replace that revno with. The > alternatives are: > > 111964.1.6 2013-03-15T16:03:54Z!handa@gnu.org > 112051 2013-03-15T16:06:12Z!handa@gnu.org Eeek--sorry, I really meant that more as an FYI for anyone who was already confused. "Don't Panic". > It's only a difference in timestamp. Do they have the same content? > If not, serious can of worms. If so, the qustion of which timestamp > to consider authoritative becomes more philosophical. It does look like the merge (112051) is indeed `just a merge'. Actually going through and comparing the diffs ("bzr diff -c 112051" vs. "bzr diff -c 11964.1.6"), the diffs off the two revisions are identical except for slight differences in context, and that's explained by the fact that 112051 looks like this: $ bzr log --line -r 112051 -n0 112051: K. Handa 2013-03-16 [merge] Optimize ASCII file reading... 111964.1.7: K. Handa 2013-03-16 [merge] merge trunk 111964.1.6: K. Handa 2013-03-16 Optimize ASCII file reading... 111964.1.5: K. Handa 2013-03-11 [merge] merge trunk i.e.: the only thing that's at all different between the two _changes_ is a slight difference in context, due to their different positions in the DAG. Had the "Optimize ASCII file reading..." change happened _after_ the second "merge trunk" (11964.1.7) instead of before it, then I do think even the diff contexts would be the same (the revision that 11964.1.7 was merging into Handa's "work" branch was trunk 12050). -- "'tis an ill wind that blows no minds." From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sun, 02 Mar 2014 05:53:09 +0200 Message-ID: <83r46ltfx6.fsf@gnu.org> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> <87fvn17gbc.fsf@slice.rozzin.com> <20140301220207.GC19461@thyrsus.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1393732415 14170 80.91.229.3 (2 Mar 2014 03:53:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Mar 2014 03:53:35 +0000 (UTC) Cc: handa@gnu.org, emacs-devel@gnu.org, rozzin@geekspace.com To: esr@thyrsus.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 02 04:53:43 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WJxTD-0003OV-A6 for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 04:53:43 +0100 Original-Received: from localhost ([::1]:34350 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJxTC-0002Jv-R1 for ged-emacs-devel@m.gmane.org; Sat, 01 Mar 2014 22:53:42 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46284) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJxT5-0002Ip-7W for emacs-devel@gnu.org; Sat, 01 Mar 2014 22:53:40 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WJxSz-0000wF-Ru for emacs-devel@gnu.org; Sat, 01 Mar 2014 22:53:35 -0500 Original-Received: from mtaout24.012.net.il ([80.179.55.180]:59789) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJxSz-0000w7-Jm; Sat, 01 Mar 2014 22:53:29 -0500 Original-Received: from conversion-daemon.mtaout24.012.net.il by mtaout24.012.net.il (HyperSendmail v2007.08) id <0N1S00000IFLE800@mtaout24.012.net.il>; Sun, 02 Mar 2014 05:51:50 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout24.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N1S00LMCIQD1G40@mtaout24.012.net.il>; Sun, 02 Mar 2014 05:51:50 +0200 (IST) In-reply-to: <20140301220207.GC19461@thyrsus.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.180 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170041 Archived-At: > Date: Sat, 1 Mar 2014 17:02:07 -0500 > From: "Eric S. Raymond" > Cc: Eli Zaretskii , handa@gnu.org, emacs-devel@gnu.org > > Oh, crap. Now I'm confused about what to replace that revno with. The > alternatives are: > > 111964.1.6 2013-03-15T16:03:54Z!handa@gnu.org > 112051 2013-03-15T16:06:12Z!handa@gnu.org > > It's only a difference in timestamp. Do they have the same content? > If not, serious can of worms. If so, the qustion of which timestamp > to consider authoritative becomes more philosophical. Between 111964.1.6 and 112051 there was 111964.1.7, so the two commits you mention cannot have the same content. And even if there were not 111964.1.7, from bzr POV those two commits are different (they have different parents). From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sun, 02 Mar 2014 05:55:59 +0200 Message-ID: <83ppm5tfsg.fsf@gnu.org> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> <87fvn17gbc.fsf@slice.rozzin.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1393732585 15415 80.91.229.3 (2 Mar 2014 03:56:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Mar 2014 03:56:25 +0000 (UTC) Cc: esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org To: Joshua Judson Rosen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 02 04:56:33 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WJxVw-0004KY-FF for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 04:56:32 +0100 Original-Received: from localhost ([::1]:34357 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJxVw-0003sF-4T for ged-emacs-devel@m.gmane.org; Sat, 01 Mar 2014 22:56:32 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46837) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJxVo-0003s5-Vq for emacs-devel@gnu.org; Sat, 01 Mar 2014 22:56:29 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WJxVj-00022L-VY for emacs-devel@gnu.org; Sat, 01 Mar 2014 22:56:24 -0500 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:50013) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJxVj-00021g-ND; Sat, 01 Mar 2014 22:56:19 -0500 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0N1S00G00IOBGC00@a-mtaout21.012.net.il>; Sun, 02 Mar 2014 05:56:18 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N1S00GRJIXTGF00@a-mtaout21.012.net.il>; Sun, 02 Mar 2014 05:56:18 +0200 (IST) In-reply-to: <87fvn17gbc.fsf@slice.rozzin.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.169 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170042 Archived-At: > From: Joshua Judson Rosen > Cc: esr@thyrsus.com (Eric S. Raymond), handa@gnu.org, emacs-devel@gnu.org > Date: Sat, 01 Mar 2014 16:35:35 -0500 > > Eli Zaretskii writes: > > > > > From: esr@thyrsus.com (Eric S. Raymond) > > > Date: Sat, 1 Mar 2014 12:13:37 -0500 (EST) > > > > > > Here's the context: > > > > > > revno: 111954.1.4 > > > committer: K. Handa > > > branch nick: work > > > timestamp: Fri 2013-03-22 00:18:44 +0900 > > > message: > > > Fix a bug introduced by revno:111954.1.97 > > > > > > It doesn't show up in a bzr log --levels=0 listing, and the fact that > > > 97 > 4 suggests the reference is garbled. > > > > I think the correct reference is 111964.1.6. It was merged in > > r112051. > > ... and the "revno:111954.1.97" was a reference to trunk revno:112051. No, it isn't, IMO: they have different parents. > The fact that the commit whose comment is making that reference is itself > from a non-mainline branch suggests that the reference may actually > not be garbled, but rather be from an obsolete context. > > The "111954.1.97" revno is actually correct relative to the "111954.1.4" > commit and Handa's "work branch" (where it would have been 111954+4=11958; > if you do "bzr branch trunk -r 111954.1.4 handa-work" and then do > "bzr log -r 111954.1.97 --show-ids handa-work", this starts to become clear). Unless you are saying that Handa-san used two different branches that both forked at trunk r111954, I don't see how .1.97 can come before .1.4 on the same branch. In any case, what we need is references to revisions recorded in Emacs bzr repo, not in foreign private branches, I hope you agree. From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Joshua Judson Rosen Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sun, 02 Mar 2014 00:53:00 -0500 Message-ID: <87ob1pywn7.fsf@slice.rozzin.com> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> <87fvn17gbc.fsf@slice.rozzin.com> <83ppm5tfsg.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1393739589 7492 80.91.229.3 (2 Mar 2014 05:53:09 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Mar 2014 05:53:09 +0000 (UTC) Cc: esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 02 06:53:17 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WJzKu-0006y8-VY for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 06:53:17 +0100 Original-Received: from localhost ([::1]:34519 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJzKu-0001hv-HX for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 00:53:16 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59091) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJzKo-0001hm-Ri for emacs-devel@gnu.org; Sun, 02 Mar 2014 00:53:15 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WJzKk-0000NW-JX for emacs-devel@gnu.org; Sun, 02 Mar 2014 00:53:10 -0500 Original-Received: from 209-20-69-211.slicehost.net ([209.20.69.211]:45555 helo=slice.rozzin.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJzKf-0000MR-Re; Sun, 02 Mar 2014 00:53:01 -0500 Original-Received: by slice.rozzin.com (Postfix, from userid 1000) id E1221C85E0; Sun, 2 Mar 2014 00:53:00 -0500 (EST) In-Reply-To: <83ppm5tfsg.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 02 Mar 2014 05:55:59 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 209.20.69.211 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170044 Archived-At: Eli Zaretskii writes: > > > From: Joshua Judson Rosen > > Cc: esr@thyrsus.com (Eric S. Raymond), handa@gnu.org, emacs-devel@gnu.org > > Date: Sat, 01 Mar 2014 16:35:35 -0500 > > > > Eli Zaretskii writes: > > > > > > > From: esr@thyrsus.com (Eric S. Raymond) > > > > Date: Sat, 1 Mar 2014 12:13:37 -0500 (EST) > > > > > > > > Here's the context: > > > > > > > > revno: 111954.1.4 > > > > committer: K. Handa > > > > branch nick: work > > > > timestamp: Fri 2013-03-22 00:18:44 +0900 > > > > message: > > > > Fix a bug introduced by revno:111954.1.97 > > > > > > > > It doesn't show up in a bzr log --levels=0 listing, and the fact that > > > > 97 > 4 suggests the reference is garbled. > > > > > > I think the correct reference is 111964.1.6. It was merged in > > > r112051. > > > > ... and the "revno:111954.1.97" was a reference to trunk revno:112051. > > No, it isn't, IMO: they have different parents. They actually don't have different parents--they have the same revid, and really _are_ the same revision-object. On Eric's spectrum between "philosophical" and "serious can of worms", I'd say the severity of picking the wrong one of these two revisions to associate with "the bug" in Handa's later commit-comment is a lot closer to "philosophical" than to "serious can of worms"..., but you can verify that Handa's "revno:111954.1.97" must have referred to trunk revno 112051: > > The fact that the commit whose comment is making that reference is itself > > from a non-mainline branch suggests that the reference may actually > > not be garbled, but rather be from an obsolete context. > > > > The "111954.1.97" revno is actually correct relative to the "111954.1.4" > > commit and Handa's "work branch" (where it would have been 111954+4=11958; > > if you do "bzr branch trunk -r 111954.1.4 handa-work" and then do > > "bzr log -r 111954.1.97 --show-ids handa-work", this starts to become clear). > > Unless you are saying that Handa-san used two different branches that > both forked at trunk r111954 Well, yes: it looks like Handa was using both "trunk" and a separate "work" branch, and merging back and forth between the two. One of the two branches _was_ trunk itself. The other branch ("work") forked off of trunk at 111954. Trunk got 97+ additional revisions, and then trunk was merged into "work"; (trunk's 112051 was thus "work's 111954.1.97"; the merge itself was "work 111955"). Handa made another change on "work" and committed it as "work 11956" (I mention this only to avoid having gaps in the narration...). Trunk got some more revisions and was again merged into "work" at "work 111957". Handa wrote "Fix bug introduced by revno:111954.1.97" into a commit at "work 111958". The same "do something in `work' and the merge trunk into `work'" cycle was repeated a couple more times on "work", up to "work 111961". Then "work" was merged back into trunk at trunk revno 112229 (where "work 111957" became "trunk 111954.1.3", "work 111958" became "trunk 111954.1.4", etc.). If you separate that "work" branch back out of trunk so that you can look at the log "from work's perspective", then all of the numbers match up with how Handa would have seen them when he wrote the comment that tripped Eric up; you can go look the commit-objects up, get their revids, and verify that "work 111954.1.97" is the same object as "trunk 112051". > I don't see how .1.97 can come before .1.4 on the same branch. Of course--they weren't on the same branch. It's illuminating to `pull the branches apart' and then compare, like this: bzr branch trunk -r 111954.1.4 handa-work ... and then you can compare what the revnos were in Handa's "work" branch vs. what they were/are in trunk, e.g.: bzr log -r 111954.1.97:handa-work trunk bzr log -r 112051:trunk handa-work bzr log --show-ids -r 111954.1.97 handa-work bzr log --show-ids -r 112051 trunk (or possibly just graph the two perspectives with "bzr qlog" or "bzr vis --limit=..."; even if you just look at one perspective, it still shows the "merging back and forth" somewhat more clearly than "bzr log" does) This is why I say that, when Handa wrote "111954.1.97" in his "work" branch, the revision that he was referencing was in fact "trunk 112051". Same node in the DAG, addressed differently by observers sitting at different points in the DAG. > In any case, what we need is references to revisions recorded in Emacs > bzr repo, not in foreign private branches, I hope you agree. Yes, of course :) -- "'tis an ill wind that blows no minds." From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sun, 02 Mar 2014 19:42:18 +0200 Message-ID: <83k3ccts3p.fsf@gnu.org> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> <87fvn17gbc.fsf@slice.rozzin.com> <83ppm5tfsg.fsf@gnu.org> <87ob1pywn7.fsf@slice.rozzin.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1393782163 16471 80.91.229.3 (2 Mar 2014 17:42:43 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Mar 2014 17:42:43 +0000 (UTC) Cc: esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org To: Joshua Judson Rosen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 02 18:42:51 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WKAPb-0001zt-51 for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 18:42:51 +0100 Original-Received: from localhost ([::1]:36210 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKAPa-0006Va-Pu for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 12:42:50 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59108) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKAPT-0006QV-7q for emacs-devel@gnu.org; Sun, 02 Mar 2014 12:42:48 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKAPN-00016a-Vz for emacs-devel@gnu.org; Sun, 02 Mar 2014 12:42:42 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:46843) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKAPN-00015z-7u; Sun, 02 Mar 2014 12:42:37 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0N1T00L00L2WQ100@a-mtaout22.012.net.il>; Sun, 02 Mar 2014 19:42:35 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N1T00L9TL6YCH90@a-mtaout22.012.net.il>; Sun, 02 Mar 2014 19:42:35 +0200 (IST) In-reply-to: <87ob1pywn7.fsf@slice.rozzin.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170054 Archived-At: > From: Joshua Judson Rosen > Cc: esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org > Date: Sun, 02 Mar 2014 00:53:00 -0500 > > > > > > revno: 111954.1.4 > > > > > committer: K. Handa > > > > > branch nick: work > > > > > timestamp: Fri 2013-03-22 00:18:44 +0900 > > > > > message: > > > > > Fix a bug introduced by revno:111954.1.97 > > > > > > > > > > It doesn't show up in a bzr log --levels=0 listing, and the fact that > > > > > 97 > 4 suggests the reference is garbled. > > > > > > > > I think the correct reference is 111964.1.6. It was merged in > > > > r112051. > > > > > > ... and the "revno:111954.1.97" was a reference to trunk revno:112051. > > > > No, it isn't, IMO: they have different parents. > > They actually don't have different parents--they have the same revid, > and really _are_ the same revision-object. No, they haven't, and no, they aren't: ------------------------------------------------------------ revno: 111964.1.6 revision-id: handa@gnu.org-20130315160354-jkntpv64yp0n0iql parent: handa@gnu.org-20130311090639-hslbvd6ot0k25lsn committer: K. Handa branch nick: work timestamp: Fri 2013-03-15 16:03:54 +0000 message: Optimize ASCII file reading with EOL format detection and decoding. ------------------------------------------------------------ revno: 111964.1.7 [merge] revision-id: handa@gnu.org-20130315160447-x6zr5fjm1ez02upn parent: handa@gnu.org-20130315160354-jkntpv64yp0n0iql parent: michael.albinus@gmx.de-20130315141906-e85ws6zvzcq6wk75 committer: K. Handa branch nick: work timestamp: Fri 2013-03-15 16:04:47 +0000 message: merge trunk ------------------------------------------------------------ revno: 112051 [merge] revision-id: handa@gnu.org-20130315160612-scmr21as4wy0g99w parent: michael.albinus@gmx.de-20130315141906-e85ws6zvzcq6wk75 parent: handa@gnu.org-20130315160447-x6zr5fjm1ez02upn committer: K. Handa branch nick: trunk timestamp: Fri 2013-03-15 16:06:12 +0000 message: Optimize ASCII file reading with EOL format detection and decoding. ------------------------------------------------------------ Bazaar is deeply branch-centric, and distinguishes between a "regular" commit and its merge-commit. > On Eric's spectrum between "philosophical" and "serious can of worms", > I'd say the severity of picking the wrong one of these two revisions > to associate with "the bug" in Handa's later commit-comment is > a lot closer to "philosophical" than to "serious can of worms"..., > but you can verify that Handa's "revno:111954.1.97" must have > referred to trunk revno 112051: I really don't see a problem, since, as can be seen from the above, the time stamps of each of these 3 revisions are different. > > Unless you are saying that Handa-san used two different branches that > > both forked at trunk r111954 > > Well, yes: it looks like Handa was using both "trunk" and a separate > "work" branch, and merging back and forth between the two. No, I meant 2 branches _in_addition_ to the trunk. > Handa wrote "Fix bug introduced by revno:111954.1.97" into a commit > at "work 111958". > > The same "do something in `work' and the merge trunk into `work'" > cycle was repeated a couple more times on "work", up to "work 111961". > > Then "work" was merged back into trunk at trunk revno 112229 > (where "work 111957" became "trunk 111954.1.3", "work 111958" > became "trunk 111954.1.4", etc.). > > If you separate that "work" branch back out of trunk so that you can > look at the log "from work's perspective", then all of the numbers match > up with how Handa would have seen them when he wrote the comment that > tripped Eric up; you can go look the commit-objects up, get their > revids, and verify that "work 111954.1.97" is the same object as > "trunk 112051". No matter what was done with the "work" branch, the count of its revisions is strictly increasing, and so .1.97 cannot possible precede .1.4. > > I don't see how .1.97 can come before .1.4 on the same branch. > > Of course--they weren't on the same branch. Then there must be a third branch, in addition to trunk and "work", and that 3rd branch must have been forked from trunk at the same revision 111954. That's what I said. > This is why I say that, when Handa wrote "111954.1.97" in his "work" branch, > the revision that he was referencing was in fact "trunk 112051". Can't happen with just 2 branches, AFAIU. > Same node in the DAG, addressed differently by observers sitting at > different points in the DAG. As I show above, they aren't the same nodes in the DAG. From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sun, 02 Mar 2014 19:44:54 +0200 Message-ID: <83iorwtrzd.fsf@gnu.org> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> <87fvn17gbc.fsf@slice.rozzin.com> <20140301220207.GC19461@thyrsus.com> <87eh2l5kif.fsf@slice.rozzin.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1393782320 18070 80.91.229.3 (2 Mar 2014 17:45:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Mar 2014 17:45:20 +0000 (UTC) Cc: esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org To: Joshua Judson Rosen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 02 18:45:28 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WKAS8-0003Fu-0k for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 18:45:28 +0100 Original-Received: from localhost ([::1]:36221 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKAS7-0008Vg-Ms for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 12:45:27 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60237) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKARy-0008Sv-8m for emacs-devel@gnu.org; Sun, 02 Mar 2014 12:45:23 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKARs-0002Rt-PS for emacs-devel@gnu.org; Sun, 02 Mar 2014 12:45:18 -0500 Original-Received: from mtaout26.012.net.il ([80.179.55.182]:53076) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKARs-0002Rb-Ha; Sun, 02 Mar 2014 12:45:12 -0500 Original-Received: from conversion-daemon.mtaout26.012.net.il by mtaout26.012.net.il (HyperSendmail v2007.08) id <0N1T00B00L0Q3G00@mtaout26.012.net.il>; Sun, 02 Mar 2014 19:43:06 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout26.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N1T005V5L7T4Z60@mtaout26.012.net.il>; Sun, 02 Mar 2014 19:43:06 +0200 (IST) In-reply-to: <87eh2l5kif.fsf@slice.rozzin.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.182 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170056 Archived-At: > From: Joshua Judson Rosen > Cc: Eli Zaretskii , handa@gnu.org, emacs-devel@gnu.org > Date: Sat, 01 Mar 2014 22:47:52 -0500 > > It does look like the merge (112051) is indeed `just a merge'. > > Actually going through and comparing the diffs ("bzr diff -c 112051" > vs. "bzr diff -c 11964.1.6"), the diffs off the two revisions are > identical except for slight differences in context This is bzr, not git, so the diffs aren't the whole story. The arrangement of the parents is also part of it, and it's different. > $ bzr log --line -r 112051 -n0 > 112051: K. Handa 2013-03-16 [merge] Optimize ASCII file reading... > 111964.1.7: K. Handa 2013-03-16 [merge] merge trunk > 111964.1.6: K. Handa 2013-03-16 Optimize ASCII file reading... > 111964.1.5: K. Handa 2013-03-11 [merge] merge trunk > > i.e.: the only thing that's at all different between the two > _changes_ is a slight difference in context, due to their different > positions in the DAG. Had the "Optimize ASCII file reading..." > change happened _after_ the second "merge trunk" (11964.1.7) > instead of before it, then I do think even the diff contexts > would be the same (the revision that 11964.1.7 was merging into > Handa's "work" branch was trunk 12050). Even if the diffs were identical, the revisions won't be. Not in bzr. From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sun, 02 Mar 2014 19:25:48 +0100 Message-ID: <8738j0ihjn.fsf@igel.home> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> <87fvn17gbc.fsf@slice.rozzin.com> <83ppm5tfsg.fsf@gnu.org> <87ob1pywn7.fsf@slice.rozzin.com> <83k3ccts3p.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1393784762 10699 80.91.229.3 (2 Mar 2014 18:26:02 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Mar 2014 18:26:02 +0000 (UTC) Cc: esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org, Joshua Judson Rosen To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 02 19:26:10 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WKB5V-0005Jw-FZ for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 19:26:09 +0100 Original-Received: from localhost ([::1]:36299 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKB5U-0004mh-T9 for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 13:26:08 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39785) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKB5N-0004gy-5H for emacs-devel@gnu.org; Sun, 02 Mar 2014 13:26:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKB5I-0006R5-DI for emacs-devel@gnu.org; Sun, 02 Mar 2014 13:26:01 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:46503) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKB5D-0006QU-4m; Sun, 02 Mar 2014 13:25:51 -0500 Original-Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3fcXws6trDz4KK3w; Sun, 2 Mar 2014 19:25:49 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3fcXws3sdDzbbgH; Sun, 2 Mar 2014 19:25:49 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id ohK4-toMKCyF; Sun, 2 Mar 2014 19:25:48 +0100 (CET) X-Auth-Info: JRgYEDpBMwhhDaOoNCsVbAduBoiL3GMwn8Zj4qxds7U= Original-Received: from igel.home (ppp-46-244-229-25.dynamic.mnet-online.de [46.244.229.25]) by mail.mnet-online.de (Postfix) with ESMTPA; Sun, 2 Mar 2014 19:25:48 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id 8B8112C3498; Sun, 2 Mar 2014 19:25:48 +0100 (CET) X-Yow: This PIZZA symbolizes my COMPLETE EMOTIONAL RECOVERY!! In-Reply-To: <83k3ccts3p.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 02 Mar 2014 19:42:18 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 212.18.0.9 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170059 Archived-At: Eli Zaretskii writes: >> From: Joshua Judson Rosen >> Cc: esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org >> Date: Sun, 02 Mar 2014 00:53:00 -0500 >> >> > > > > revno: 111954.1.4 >> > > > > committer: K. Handa >> > > > > branch nick: work >> > > > > timestamp: Fri 2013-03-22 00:18:44 +0900 >> > > > > message: >> > > > > Fix a bug introduced by revno:111954.1.97 >> > > > > >> > > > > It doesn't show up in a bzr log --levels=0 listing, and the fact that >> > > > > 97 > 4 suggests the reference is garbled. >> > > > >> > > > I think the correct reference is 111964.1.6. It was merged in >> > > > r112051. >> > > >> > > ... and the "revno:111954.1.97" was a reference to trunk revno:112051. >> > >> > No, it isn't, IMO: they have different parents. >> >> They actually don't have different parents--they have the same revid, >> and really _are_ the same revision-object. > > No, they haven't, and no, they aren't: > > ------------------------------------------------------------ > revno: 111964.1.6 revno:111954.1.97 refers to revno:112051, not revno:111964.1.6. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sun, 02 Mar 2014 19:26:46 +0100 Message-ID: <871tykihi1.fsf@igel.home> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> <87fvn17gbc.fsf@slice.rozzin.com> <20140301220207.GC19461@thyrsus.com> <87eh2l5kif.fsf@slice.rozzin.com> <83iorwtrzd.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1393784821 11370 80.91.229.3 (2 Mar 2014 18:27:01 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Mar 2014 18:27:01 +0000 (UTC) Cc: esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org, Joshua Judson Rosen To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 02 19:27:09 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WKB6S-0005lM-0r for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 19:27:08 +0100 Original-Received: from localhost ([::1]:36303 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKB6R-0005a8-JQ for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 13:27:07 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKB6K-0005Zv-9Y for emacs-devel@gnu.org; Sun, 02 Mar 2014 13:27:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKB6E-0006dW-S9 for emacs-devel@gnu.org; Sun, 02 Mar 2014 13:27:00 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:50822) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKB68-0006cV-Ep; Sun, 02 Mar 2014 13:26:48 -0500 Original-Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3fcXxz74N7z4KK29; Sun, 2 Mar 2014 19:26:47 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3fcXxz6mlSzbbbr; Sun, 2 Mar 2014 19:26:47 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id YleIMSvNqgOq; Sun, 2 Mar 2014 19:26:46 +0100 (CET) X-Auth-Info: zxWGIztIBJhsLe8dh6zPp4BC0JebjwJ/Zqn8uihQQY8= Original-Received: from igel.home (ppp-46-244-229-25.dynamic.mnet-online.de [46.244.229.25]) by mail.mnet-online.de (Postfix) with ESMTPA; Sun, 2 Mar 2014 19:26:46 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id 4135B2C3498; Sun, 2 Mar 2014 19:26:46 +0100 (CET) X-Yow: --Hello, POLICE? I"ve got ABBOTT & COSTELLO here on suspicion of HIGHWAY ROBBERY!! In-Reply-To: <83iorwtrzd.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 02 Mar 2014 19:44:54 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 212.18.0.9 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170060 Archived-At: Eli Zaretskii writes: > This is bzr, not git, so the diffs aren't the whole story. There is no difference between git and bzr wrt. to the DAG. Only the names they use are different. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Joshua Judson Rosen Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sun, 02 Mar 2014 14:08:07 -0500 Message-ID: <877g8cxvu0.fsf@slice.rozzin.com> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> <87fvn17gbc.fsf@slice.rozzin.com> <83ppm5tfsg.fsf@gnu.org> <87ob1pywn7.fsf@slice.rozzin.com> <83k3ccts3p.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1393787298 3785 80.91.229.3 (2 Mar 2014 19:08:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Mar 2014 19:08:18 +0000 (UTC) Cc: esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 02 20:08:26 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WKBkQ-00088f-Gz for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 20:08:26 +0100 Original-Received: from localhost ([::1]:36367 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKBkP-000095-T8 for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 14:08:25 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKBkJ-000090-68 for emacs-devel@gnu.org; Sun, 02 Mar 2014 14:08:24 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKBkE-0002x2-Aa for emacs-devel@gnu.org; Sun, 02 Mar 2014 14:08:19 -0500 Original-Received: from 209-20-69-211.slicehost.net ([209.20.69.211]:55315 helo=slice.rozzin.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKBk9-0002wE-4G; Sun, 02 Mar 2014 14:08:09 -0500 Original-Received: by slice.rozzin.com (Postfix, from userid 1000) id 20C6BC8622; Sun, 2 Mar 2014 14:08:08 -0500 (EST) In-Reply-To: <83k3ccts3p.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 02 Mar 2014 19:42:18 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 209.20.69.211 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170062 Archived-At: Eli Zaretskii writes: > > > > > > I think the correct reference is 111964.1.6. It was merged in > > > > > r112051. > > > > > > > > ... and the "revno:111954.1.97" was a reference to trunk revno:112051. > > > > > > No, it isn't, IMO: they have different parents. > > > > They actually don't have different parents--they have the same revid, > > and really _are_ the same revision-object. > > No, they haven't, and no, they aren't: [...] > > Same node in the DAG, addressed differently by observers sitting at > > different points in the DAG. > > As I show above, they aren't the same nodes in the DAG. I'm afraid there's a misunderstanding here about which "they" we're talking about.... I didn't say that "trunk 111964.1.6" was the same node as "trunk 112051"; it's self-evident that "trunk 11964.1.6" was merged by "trunk 112051", and that the two are therefor necessarily different nodes in the DAG. I'm in `violent *agreement*' with you about that :) The question that Eric asked, and that I was answering, was what Handa's "*work* 111954.1.97" was, and the answer is: "*work* 111954.1.97" is the same as "*trunk* 112051" I'm not sure what I'm being unclear about. Have you tried running through the procudure that I laid out (starting at "bzr branch trunk -r 111954.1.4 handa-work")? If you just do this: bzr branch trunk -r 111954.1.4 handa-work bzr log handa-work -r 111958 # notice Handa's comment about "111954.1.97" bzr log trunk -r 111954.1.97:handa-work Is there actually something in there that you disagree with? What procedure led you to the conclusion that Handa's "work 111954.1.97" was the same node as "trunk 111964.1.6"? -- "'tis an ill wind that blows no minds." From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Joshua Judson Rosen Newsgroups: gmane.emacs.devel Subject: Policy on referencing/abbreviating git commit-IDs, going forward? (was: Can anyone correct the Bazaar reference "revno:111954.1.97"?) Date: Sun, 02 Mar 2014 15:01:50 -0500 Message-ID: <87r46kv07l.fsf_-_@slice.rozzin.com> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> <87fvn17gbc.fsf@slice.rozzin.com> <20140301220207.GC19461@thyrsus.com> <87eh2l5kif.fsf@slice.rozzin.com> <83iorwtrzd.fsf@gnu.org> <871tykihi1.fsf@igel.home> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1393790519 4900 80.91.229.3 (2 Mar 2014 20:01:59 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Mar 2014 20:01:59 +0000 (UTC) Cc: esr@thyrsus.com, handa@gnu.org, Eli Zaretskii , emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 02 21:02:07 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WKCaN-0008GI-Nf for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 21:02:07 +0100 Original-Received: from localhost ([::1]:36505 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKCaN-0008Rw-1F for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 15:02:07 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51890) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKCaG-0008RT-W3 for emacs-devel@gnu.org; Sun, 02 Mar 2014 15:02:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKCaC-0001PP-Jf for emacs-devel@gnu.org; Sun, 02 Mar 2014 15:02:00 -0500 Original-Received: from 209-20-69-211.slicehost.net ([209.20.69.211]:49132 helo=slice.rozzin.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKCa7-0001OS-CL; Sun, 02 Mar 2014 15:01:51 -0500 Original-Received: by slice.rozzin.com (Postfix, from userid 1000) id 694B7C8622; Sun, 2 Mar 2014 15:01:50 -0500 (EST) In-Reply-To: <871tykihi1.fsf@igel.home> (Andreas Schwab's message of "Sun, 02 Mar 2014 19:26:46 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 209.20.69.211 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170064 Archived-At: Andreas Schwab writes: > > Eli Zaretskii writes: > > > This is bzr, not git, so the diffs aren't the whole story. > > There is no difference between git and bzr wrt. to the DAG. Only the > names they use are different. There is an interesting `bzr vs. git' question here, though--because of the differences in the way revisions are named: when you run into the analogous "I can't tell what this reference is to" problem in git, how will you deal with it? When someone writes a abbreviated git sha1sum into a changelog / commit message because just the first 7 or howevermany hexits was enough to unambiguously identify the referenced commit-object in their development environment at the time when they were committing their change, and then a later commit/merge makes that abbreviation ambiguous, how will you trace out the now-ambiguously- abbreviated commit? e.g.: up through July 29 2012, "7a62fbf" unambiguously identified a commit from October 24 2007; on July 30 2012, "7a62fbf" stopped being unambiguous. -- "'tis an ill wind that blows no minds." From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Policy on referencing/abbreviating git commit-IDs, going forward? Date: Sun, 02 Mar 2014 21:30:09 +0100 Message-ID: <87sir0gx7y.fsf@igel.home> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> <87fvn17gbc.fsf@slice.rozzin.com> <20140301220207.GC19461@thyrsus.com> <87eh2l5kif.fsf@slice.rozzin.com> <83iorwtrzd.fsf@gnu.org> <871tykihi1.fsf@igel.home> <87r46kv07l.fsf_-_@slice.rozzin.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1393792236 22682 80.91.229.3 (2 Mar 2014 20:30:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Mar 2014 20:30:36 +0000 (UTC) Cc: esr@thyrsus.com, handa@gnu.org, Eli Zaretskii , emacs-devel@gnu.org To: Joshua Judson Rosen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 02 21:30:39 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WKD1x-0004O5-O6 for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 21:30:37 +0100 Original-Received: from localhost ([::1]:36563 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKD1w-0006Bs-FK for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 15:30:36 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55245) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKD1k-0006Bm-9e for emacs-devel@gnu.org; Sun, 02 Mar 2014 15:30:29 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKD1e-00013w-OE for emacs-devel@gnu.org; Sun, 02 Mar 2014 15:30:24 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:55631) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKD1Y-00012y-MF; Sun, 02 Mar 2014 15:30:12 -0500 Original-Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3fcbhM0r8Gz4KK2S; Sun, 2 Mar 2014 21:30:10 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3fcbhL2P9Qzbbfy; Sun, 2 Mar 2014 21:30:10 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id 5h-bhgT9KUSm; Sun, 2 Mar 2014 21:30:09 +0100 (CET) X-Auth-Info: nOCnyd3YTJF5rchUdAbqOTpZ3LcqtkzdbS9r+B1O2xE= Original-Received: from igel.home (ppp-46-244-229-25.dynamic.mnet-online.de [46.244.229.25]) by mail.mnet-online.de (Postfix) with ESMTPA; Sun, 2 Mar 2014 21:30:09 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id 526D72C1B2D; Sun, 2 Mar 2014 21:30:09 +0100 (CET) X-Yow: Now I'm being INVOLUNTARILY shuffled closer to the CLAM DIP with the BROKEN PLASTIC FORKS in it!! In-Reply-To: <87r46kv07l.fsf_-_@slice.rozzin.com> (Joshua Judson Rosen's message of "Sun, 02 Mar 2014 15:01:50 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 212.18.0.9 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170066 Archived-At: Joshua Judson Rosen writes: > abbreviation ambiguous, how will you trace out the now-ambiguously- > abbreviated commit? e.g.: up through July 29 2012, "7a62fbf" > unambiguously identified a commit from October 24 2007; on July 30 2012, > "7a62fbf" stopped being unambiguous. If you know it was previsouly unambiguous you know that it refers to the older one. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sun, 02 Mar 2014 22:33:55 +0200 Message-ID: <83bnxotk5o.fsf@gnu.org> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> <87fvn17gbc.fsf@slice.rozzin.com> <83ppm5tfsg.fsf@gnu.org> <87ob1pywn7.fsf@slice.rozzin.com> <83k3ccts3p.fsf@gnu.org> <8738j0ihjn.fsf@igel.home> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1393792465 24593 80.91.229.3 (2 Mar 2014 20:34:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Mar 2014 20:34:25 +0000 (UTC) Cc: esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org, rozzin@geekspace.com To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 02 21:34:28 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WKD5d-00068W-G3 for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 21:34:25 +0100 Original-Received: from localhost ([::1]:36571 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKD5d-0007S3-3d for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 15:34:25 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56196) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKD5V-0007Ry-O6 for emacs-devel@gnu.org; Sun, 02 Mar 2014 15:34:22 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKD5R-0002G9-0C for emacs-devel@gnu.org; Sun, 02 Mar 2014 15:34:17 -0500 Original-Received: from mtaout25.012.net.il ([80.179.55.181]:34968) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKD5Q-0002Fz-OA; Sun, 02 Mar 2014 15:34:12 -0500 Original-Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0N1T00100SU9AO00@mtaout25.012.net.il>; Sun, 02 Mar 2014 22:32:32 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N1T00I8XT27KN80@mtaout25.012.net.il>; Sun, 02 Mar 2014 22:32:31 +0200 (IST) In-reply-to: <8738j0ihjn.fsf@igel.home> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.181 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170068 Archived-At: > From: Andreas Schwab > Cc: Joshua Judson Rosen , esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org > Date: Sun, 02 Mar 2014 19:25:48 +0100 > > revno:111954.1.97 refers to revno:112051, not revno:111964.1.6. Maybe so, but how did you determine that? From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sun, 02 Mar 2014 22:35:47 +0200 Message-ID: <83a9d8tk2k.fsf@gnu.org> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> <87fvn17gbc.fsf@slice.rozzin.com> <20140301220207.GC19461@thyrsus.com> <87eh2l5kif.fsf@slice.rozzin.com> <83iorwtrzd.fsf@gnu.org> <871tykihi1.fsf@igel.home> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1393792570 25618 80.91.229.3 (2 Mar 2014 20:36:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Mar 2014 20:36:10 +0000 (UTC) Cc: esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org, rozzin@geekspace.com To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 02 21:36:17 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WKD7Q-00071B-IL for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 21:36:16 +0100 Original-Received: from localhost ([::1]:36577 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKD7Q-0000QO-58 for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 15:36:16 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56454) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKD7J-0000QI-BS for emacs-devel@gnu.org; Sun, 02 Mar 2014 15:36:14 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKD7E-0002nH-Js for emacs-devel@gnu.org; Sun, 02 Mar 2014 15:36:09 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:44466) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKD7E-0002nD-Bh; Sun, 02 Mar 2014 15:36:04 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0N1T00M00T1IZY00@a-mtaout22.012.net.il>; Sun, 02 Mar 2014 22:36:03 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N1T00NZZT830200@a-mtaout22.012.net.il>; Sun, 02 Mar 2014 22:36:03 +0200 (IST) In-reply-to: <871tykihi1.fsf@igel.home> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170069 Archived-At: > From: Andreas Schwab > Cc: Joshua Judson Rosen , esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org > Date: Sun, 02 Mar 2014 19:26:46 +0100 > > Eli Zaretskii writes: > > > This is bzr, not git, so the diffs aren't the whole story. > > There is no difference between git and bzr wrt. to the DAG. Only the > names they use are different. I thought git didn't have merge commits that recorded only the merge, isn't that right? Apologies if I was mistaken about that. But if I wasn't mistaken, then that;s the difference I alluded to. From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sun, 02 Mar 2014 22:38:44 +0200 Message-ID: <838usstjxn.fsf@gnu.org> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> <87fvn17gbc.fsf@slice.rozzin.com> <83ppm5tfsg.fsf@gnu.org> <87ob1pywn7.fsf@slice.rozzin.com> <83k3ccts3p.fsf@gnu.org> <877g8cxvu0.fsf@slice.rozzin.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1393792768 27532 80.91.229.3 (2 Mar 2014 20:39:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Mar 2014 20:39:28 +0000 (UTC) Cc: esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org To: Joshua Judson Rosen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 02 21:39:35 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WKDAa-0008RB-4L for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 21:39:32 +0100 Original-Received: from localhost ([::1]:36583 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKDAZ-00015y-OK for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 15:39:31 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKDAB-0000zF-4g for emacs-devel@gnu.org; Sun, 02 Mar 2014 15:39:12 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKDA6-0003fL-4w for emacs-devel@gnu.org; Sun, 02 Mar 2014 15:39:07 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:48962) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKDA5-0003f7-So; Sun, 02 Mar 2014 15:39:02 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0N1T00M00T238H00@a-mtaout20.012.net.il>; Sun, 02 Mar 2014 22:39:00 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N1T00MYVTD00260@a-mtaout20.012.net.il>; Sun, 02 Mar 2014 22:39:00 +0200 (IST) In-reply-to: <877g8cxvu0.fsf@slice.rozzin.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170070 Archived-At: > From: Joshua Judson Rosen > Cc: esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org > Date: Sun, 02 Mar 2014 14:08:07 -0500 > > What procedure led you to the conclusion that Handa's "work 111954.1.97" > was the same node as "trunk 111964.1.6"? I looked for the commit that first introduced the changes which the reference alluded to, and which were corrected in the referencing commit, 111954.1.4. From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sun, 02 Mar 2014 22:08:53 +0100 Message-ID: <87ob1ogvfe.fsf@igel.home> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> <87fvn17gbc.fsf@slice.rozzin.com> <20140301220207.GC19461@thyrsus.com> <87eh2l5kif.fsf@slice.rozzin.com> <83iorwtrzd.fsf@gnu.org> <871tykihi1.fsf@igel.home> <83a9d8tk2k.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1393794550 13010 80.91.229.3 (2 Mar 2014 21:09:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Mar 2014 21:09:10 +0000 (UTC) Cc: esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org, rozzin@geekspace.com To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 02 22:09:18 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WKDdL-0005Hg-KS for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 22:09:15 +0100 Original-Received: from localhost ([::1]:36634 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKDdL-0002YY-4E for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 16:09:15 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33413) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKDdD-0002XB-E0 for emacs-devel@gnu.org; Sun, 02 Mar 2014 16:09:12 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKDd8-000424-NR for emacs-devel@gnu.org; Sun, 02 Mar 2014 16:09:07 -0500 Original-Received: from mail-out.m-online.net ([2001:a60:0:28:0:1:25:1]:56254) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKDd2-0003wQ-Kb; Sun, 02 Mar 2014 16:08:56 -0500 Original-Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3fccY30zgjz3hj7r; Sun, 2 Mar 2014 22:08:54 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3fccY22JGfzbbgN; Sun, 2 Mar 2014 22:08:54 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id t-uTVcMcdI_L; Sun, 2 Mar 2014 22:08:53 +0100 (CET) X-Auth-Info: Kb941irKnpwAUE76yxHbK8418NXyotd4ezsIFmfeCHM= Original-Received: from igel.home (ppp-46-244-229-25.dynamic.mnet-online.de [46.244.229.25]) by mail.mnet-online.de (Postfix) with ESMTPA; Sun, 2 Mar 2014 22:08:53 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id 56B262C0461; Sun, 2 Mar 2014 22:08:53 +0100 (CET) X-Yow: HOW could a GLASS be YELLING?? In-Reply-To: <83a9d8tk2k.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 02 Mar 2014 22:35:47 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 2001:a60:0:28:0:1:25:1 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170071 Archived-At: Eli Zaretskii writes: > I thought git didn't have merge commits that recorded only the merge, > isn't that right? I don't know what this is supposed to mean. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sun, 02 Mar 2014 22:10:49 +0100 Message-ID: <87k3ccgvc6.fsf@igel.home> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> <87fvn17gbc.fsf@slice.rozzin.com> <83ppm5tfsg.fsf@gnu.org> <87ob1pywn7.fsf@slice.rozzin.com> <83k3ccts3p.fsf@gnu.org> <8738j0ihjn.fsf@igel.home> <83bnxotk5o.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1393794663 14260 80.91.229.3 (2 Mar 2014 21:11:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Mar 2014 21:11:03 +0000 (UTC) Cc: esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org, rozzin@geekspace.com To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 02 22:11:10 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WKDfC-0006Ac-0z for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 22:11:10 +0100 Original-Received: from localhost ([::1]:36639 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKDfB-0003v4-Hz for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 16:11:09 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKDf4-0003oA-2X for emacs-devel@gnu.org; Sun, 02 Mar 2014 16:11:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKDez-0004bU-AX for emacs-devel@gnu.org; Sun, 02 Mar 2014 16:11:02 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:54264) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKDeu-0004au-0a; Sun, 02 Mar 2014 16:10:52 -0500 Original-Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3fccbH2MwLz4KK3M; Sun, 2 Mar 2014 22:10:50 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3fccbG5tYKzbbgB; Sun, 2 Mar 2014 22:10:50 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id ZAXIKl9zqj2r; Sun, 2 Mar 2014 22:10:50 +0100 (CET) X-Auth-Info: UPhU6MKhBmMoLxeW6pksOTkxSfnoaUGQjSm3/gcS51g= Original-Received: from igel.home (ppp-46-244-229-25.dynamic.mnet-online.de [46.244.229.25]) by mail.mnet-online.de (Postfix) with ESMTPA; Sun, 2 Mar 2014 22:10:50 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id ED33B2C0461; Sun, 2 Mar 2014 22:10:49 +0100 (CET) X-Yow: I'm having an emotional outburst!! In-Reply-To: <83bnxotk5o.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 02 Mar 2014 22:33:55 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 212.18.0.9 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170072 Archived-At: Eli Zaretskii writes: >> From: Andreas Schwab >> Cc: Joshua Judson Rosen , esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org >> Date: Sun, 02 Mar 2014 19:25:48 +0100 >> >> revno:111954.1.97 refers to revno:112051, not revno:111964.1.6. > > Maybe so, but how did you determine that? The fixup comes immediately after it. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Joshua Judson Rosen Newsgroups: gmane.emacs.devel Subject: Re: Policy on referencing/abbreviating git commit-IDs, going forward? Date: Sun, 02 Mar 2014 16:18:49 -0500 Message-ID: <8738j0ti2u.fsf@slice.rozzin.com> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> <87fvn17gbc.fsf@slice.rozzin.com> <20140301220207.GC19461@thyrsus.com> <87eh2l5kif.fsf@slice.rozzin.com> <83iorwtrzd.fsf@gnu.org> <871tykihi1.fsf@igel.home> <87r46kv07l.fsf_-_@slice.rozzin.com> <87sir0gx7y.fsf@igel.home> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1393795141 19099 80.91.229.3 (2 Mar 2014 21:19:01 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Mar 2014 21:19:01 +0000 (UTC) Cc: esr@thyrsus.com, handa@gnu.org, Eli Zaretskii , emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 02 22:19:09 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WKDmu-0001Ok-RZ for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 22:19:09 +0100 Original-Received: from localhost ([::1]:36669 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKDms-0006QX-CO for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 16:19:06 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34913) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKDml-0006QH-F0 for emacs-devel@gnu.org; Sun, 02 Mar 2014 16:19:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKDmg-0006fB-TB for emacs-devel@gnu.org; Sun, 02 Mar 2014 16:18:59 -0500 Original-Received: from 209-20-69-211.slicehost.net ([209.20.69.211]:49918 helo=slice.rozzin.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKDmb-0006U2-Qa; Sun, 02 Mar 2014 16:18:49 -0500 Original-Received: by slice.rozzin.com (Postfix, from userid 1000) id 3D889C81E4; Sun, 2 Mar 2014 16:18:49 -0500 (EST) In-Reply-To: <87sir0gx7y.fsf@igel.home> (Andreas Schwab's message of "Sun, 02 Mar 2014 21:30:09 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 209.20.69.211 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170073 Archived-At: Andreas Schwab writes: > > Joshua Judson Rosen writes: > > > abbreviation ambiguous, how will you trace out the now-ambiguously- > > abbreviated commit? e.g.: up through July 29 2012, "7a62fbf" > > unambiguously identified a commit from October 24 2007; on July 30 2012, > > "7a62fbf" stopped being unambiguous. > > If you know it was previsouly unambiguous you know that it refers to the > older one. I don't think one necessarily _does_ know that in any meaningful way, when the situation crops up analogously to how it just did; I'm just thinking, it may be worth putting a "do not use abbreviated sha1 refs in your commit comments" or similar policy statement somewhere prominent in the wiki and other docs, if it's not already there. When you find an abbreviated ref in a revision that got merged in from another branch/repository (which is what just happened), you only know that it was previously unambiguous _in the author's own local repository_ where the text using the abbreviation was written, not that it was previously unambiguous in the mainline repository, and certainly not that it was previously unambiguous in the mainline repository's trunk branch (or in any other particular branch). Not everyone pulls/pushes all branches when they sync with the mainline repository, so it's entirely possible that two developers working on separate branches to not have each others ambiguously-abbreviated revisions in their own repositories (even when one of those branches is the trunk). I'm not sure what the probability is over however long git will be in use; the probability surely increases if more developers more-abbreviated refs, though. -- "'tis an ill wind that blows no minds." From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sun, 02 Mar 2014 23:27:36 +0200 Message-ID: <8338j0tho7.fsf@gnu.org> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> <87fvn17gbc.fsf@slice.rozzin.com> <83ppm5tfsg.fsf@gnu.org> <87ob1pywn7.fsf@slice.rozzin.com> <83k3ccts3p.fsf@gnu.org> <8738j0ihjn.fsf@igel.home> <83bnxotk5o.fsf@gnu.org> <87k3ccgvc6.fsf@igel.home> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1393795680 24841 80.91.229.3 (2 Mar 2014 21:28:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Mar 2014 21:28:00 +0000 (UTC) Cc: esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org, rozzin@geekspace.com To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 02 22:28:07 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WKDvb-0005dN-CB for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 22:28:07 +0100 Original-Received: from localhost ([::1]:36684 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKDva-0001Ki-UR for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 16:28:06 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36069) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKDvT-0001Ka-NS for emacs-devel@gnu.org; Sun, 02 Mar 2014 16:28:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKDvO-0000Vv-UQ for emacs-devel@gnu.org; Sun, 02 Mar 2014 16:27:59 -0500 Original-Received: from mtaout25.012.net.il ([80.179.55.181]:45807) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKDvO-0000Vp-HK; Sun, 02 Mar 2014 16:27:54 -0500 Original-Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0N1T00B00VE9VH00@mtaout25.012.net.il>; Sun, 02 Mar 2014 23:26:13 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N1T0044GVJPX470@mtaout25.012.net.il>; Sun, 02 Mar 2014 23:26:13 +0200 (IST) In-reply-to: <87k3ccgvc6.fsf@igel.home> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.181 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170074 Archived-At: > From: Andreas Schwab > Cc: rozzin@geekspace.com, esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org > Date: Sun, 02 Mar 2014 22:10:49 +0100 > > Eli Zaretskii writes: > > >> From: Andreas Schwab > >> Cc: Joshua Judson Rosen , esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org > >> Date: Sun, 02 Mar 2014 19:25:48 +0100 > >> > >> revno:111954.1.97 refers to revno:112051, not revno:111964.1.6. > > > > Maybe so, but how did you determine that? > > The fixup comes immediately after it. Not sure I'm following you. What fixup are you referring to? If you mean the fixup in 111954.1.4, then this is what I see: 112229: K. Handa 2013-04-05 [merge] Optimize the code for reading UTF-8 files. 111954.1.7: K. Handa 2013-04-05 [merge] merge trunk 111954.1.6: K. Handa 2013-04-05 Optimize the code for reading UTF-8 files. 111954.1.5: K. Handa 2013-03-21 [merge] merge trunk 111954.1.4: K. Handa 2013-03-21 Fix a bug introduced by revno:111954.1.97 ... 112098: K. Handa 2013-03-20 [merge] coding.c (syms_of_coding): Initialize disable_ascii_optimization 1. 111954.1.3: K. Handa 2013-03-20 [merge] merge trunk 111954.1.2: K. Handa 2013-03-20 coding.c (syms_of_coding): Initialize disable_ascii_optimization 1. 111954.1.1: K. Handa 2013-03-19 [merge] merge trunk ... 112051: K. Handa 2013-03-15 [merge] Optimize ASCII file reading with EOL formatdetection and decoding. 111964.1.7: K. Handa 2013-03-15 [merge] merge trunk 111964.1.6: K. Handa 2013-03-15 Optimize ASCII file reading with EOL format detection and decoding. 111964.1.5: K. Handa 2013-03-11 [merge] merge trunk My reading of this is that what was fixed in 111954.1.4 was introduced in 111964.1.6 (I saw that by looking at the diffs of these commits), and there are 6 days and many commits between those two. On the trunk, the code appeared in r112051 and was fixed in r112229. Am I missing something? From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Joshua Judson Rosen Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sun, 02 Mar 2014 17:00:11 -0500 Message-ID: <87d2i4s1lg.fsf@slice.rozzin.com> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> <87fvn17gbc.fsf@slice.rozzin.com> <83ppm5tfsg.fsf@gnu.org> <87ob1pywn7.fsf@slice.rozzin.com> <83k3ccts3p.fsf@gnu.org> <877g8cxvu0.fsf@slice.rozzin.com> <838usstjxn.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1393797624 11506 80.91.229.3 (2 Mar 2014 22:00:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Mar 2014 22:00:24 +0000 (UTC) Cc: esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 02 23:00:33 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WKEQw-0003Qb-BV for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 23:00:30 +0100 Original-Received: from localhost ([::1]:36748 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKEQv-0005kQ-Vs for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 17:00:29 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKEQo-0005dU-2W for emacs-devel@gnu.org; Sun, 02 Mar 2014 17:00:26 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKEQj-0001nK-Ra for emacs-devel@gnu.org; Sun, 02 Mar 2014 17:00:22 -0500 Original-Received: from 209-20-69-211.slicehost.net ([209.20.69.211]:59712 helo=slice.rozzin.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKEQf-0001mY-7y; Sun, 02 Mar 2014 17:00:13 -0500 Original-Received: by slice.rozzin.com (Postfix, from userid 1000) id 3330CC81E4; Sun, 2 Mar 2014 17:00:12 -0500 (EST) In-Reply-To: <838usstjxn.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 02 Mar 2014 22:38:44 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 209.20.69.211 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170081 Archived-At: Eli Zaretskii writes: > > > From: Joshua Judson Rosen > > Cc: esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org > > Date: Sun, 02 Mar 2014 14:08:07 -0500 > > > > What procedure led you to the conclusion that Handa's "work 111954.1.97" > > was the same node as "trunk 111964.1.6"? > > I looked for the commit that first introduced the changes which the > reference alluded to, and which were corrected in the referencing > commit, 111954.1.4. Why not just ask bzr to interpret the "111954.1.97" reference, and tell you what it thinks the reference meant in its original context? -- "'tis an ill wind that blows no minds." From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sun, 02 Mar 2014 23:14:18 +0100 Message-ID: <87fvn0gsed.fsf@igel.home> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> <87fvn17gbc.fsf@slice.rozzin.com> <83ppm5tfsg.fsf@gnu.org> <87ob1pywn7.fsf@slice.rozzin.com> <83k3ccts3p.fsf@gnu.org> <8738j0ihjn.fsf@igel.home> <83bnxotk5o.fsf@gnu.org> <87k3ccgvc6.fsf@igel.home> <8338j0tho7.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1393798473 19493 80.91.229.3 (2 Mar 2014 22:14:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Mar 2014 22:14:33 +0000 (UTC) Cc: esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org, rozzin@geekspace.com To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 02 23:14:41 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WKEee-0001ck-Pu for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 23:14:40 +0100 Original-Received: from localhost ([::1]:36804 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKEed-0008MV-Vt for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 17:14:39 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKEeW-0008MK-RR for emacs-devel@gnu.org; Sun, 02 Mar 2014 17:14:37 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKEeS-0005qI-33 for emacs-devel@gnu.org; Sun, 02 Mar 2014 17:14:32 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.10]:53845) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKEeL-0005ox-Cb; Sun, 02 Mar 2014 17:14:21 -0500 Original-Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3fcf0W70bfz3hjFj; Sun, 2 Mar 2014 23:14:19 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3fcf0W19CXzbbgQ; Sun, 2 Mar 2014 23:14:19 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id 2tJRyaddta2c; Sun, 2 Mar 2014 23:14:18 +0100 (CET) X-Auth-Info: ChTMccPbqxb1fETAWOZ9W4iz17k3hYTkusl47Kex+cw= Original-Received: from igel.home (ppp-46-244-229-25.dynamic.mnet-online.de [46.244.229.25]) by mail.mnet-online.de (Postfix) with ESMTPA; Sun, 2 Mar 2014 23:14:18 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id 3FE3F2C0120; Sun, 2 Mar 2014 23:14:18 +0100 (CET) X-Yow: NOW, I'm taking the NEXT FLIGHT to ACAPULCO so I can write POEMS about BROKEN GUITAR STRINGS and sensuous PRE-TEENS!! In-Reply-To: <8338j0tho7.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 02 Mar 2014 23:27:36 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 212.18.0.10 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170082 Archived-At: Eli Zaretskii writes: >> From: Andreas Schwab >> Cc: rozzin@geekspace.com, esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org >> Date: Sun, 02 Mar 2014 22:10:49 +0100 >> >> Eli Zaretskii writes: >> >> >> From: Andreas Schwab >> >> Cc: Joshua Judson Rosen , esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org >> >> Date: Sun, 02 Mar 2014 19:25:48 +0100 >> >> >> >> revno:111954.1.97 refers to revno:112051, not revno:111964.1.6. >> > >> > Maybe so, but how did you determine that? It cannot be the on the same branch, since it's not a plain number (handa@gnu.org-20130320075820-0qzn1jnrqj0y2g4m is on the same branch). (Bzr revnos are useless without context.) Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sun, 02 Mar 2014 23:15:58 +0100 Message-ID: <87bnxogsbl.fsf@igel.home> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> <87fvn17gbc.fsf@slice.rozzin.com> <83ppm5tfsg.fsf@gnu.org> <87ob1pywn7.fsf@slice.rozzin.com> <83k3ccts3p.fsf@gnu.org> <877g8cxvu0.fsf@slice.rozzin.com> <838usstjxn.fsf@gnu.org> <87d2i4s1lg.fsf@slice.rozzin.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1393798575 20430 80.91.229.3 (2 Mar 2014 22:16:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Mar 2014 22:16:15 +0000 (UTC) Cc: esr@thyrsus.com, handa@gnu.org, Eli Zaretskii , emacs-devel@gnu.org To: Joshua Judson Rosen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 02 23:16:20 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WKEgF-0002OM-FH for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 23:16:19 +0100 Original-Received: from localhost ([::1]:36821 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKEgF-0002H9-1T for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 17:16:19 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43874) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKEg7-0002H4-R3 for emacs-devel@gnu.org; Sun, 02 Mar 2014 17:16:16 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKEg2-0006Wa-H2 for emacs-devel@gnu.org; Sun, 02 Mar 2014 17:16:11 -0500 Original-Received: from mail-out.m-online.net ([2001:a60:0:28:0:1:25:1]:34875) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKEfw-0006Uk-BF; Sun, 02 Mar 2014 17:16:00 -0500 Original-Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3fcf2R58dcz3hj9B; Sun, 2 Mar 2014 23:15:59 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3fcf2R4vYFzbbg7; Sun, 2 Mar 2014 23:15:59 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id QqAh0EPnr0JM; Sun, 2 Mar 2014 23:15:58 +0100 (CET) X-Auth-Info: GxyrT5u3KgVC6ryT14YNOOllyhCCgclhdbGpjfm6Dd4= Original-Received: from igel.home (ppp-46-244-229-25.dynamic.mnet-online.de [46.244.229.25]) by mail.mnet-online.de (Postfix) with ESMTPA; Sun, 2 Mar 2014 23:15:58 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id 4A2672C0120; Sun, 2 Mar 2014 23:15:58 +0100 (CET) X-Yow: I'm a nuclear submarine under the polar ice cap and I need a Kleenex! In-Reply-To: <87d2i4s1lg.fsf@slice.rozzin.com> (Joshua Judson Rosen's message of "Sun, 02 Mar 2014 17:00:11 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 2001:a60:0:28:0:1:25:1 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170083 Archived-At: Joshua Judson Rosen writes: > Why not just ask bzr to interpret the "111954.1.97" reference, Bzr revnos are useless without context. You need to ask on the original branch, otherwise they are meaningless. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Joshua Judson Rosen Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sun, 02 Mar 2014 17:22:44 -0500 Message-ID: <87lhwsqlzf.fsf@slice.rozzin.com> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> <87fvn17gbc.fsf@slice.rozzin.com> <83ppm5tfsg.fsf@gnu.org> <87ob1pywn7.fsf@slice.rozzin.com> <83k3ccts3p.fsf@gnu.org> <877g8cxvu0.fsf@slice.rozzin.com> <838usstjxn.fsf@gnu.org> <87d2i4s1lg.fsf@slice.rozzin.com> <87bnxogsbl.fsf@igel.home> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1393798977 24701 80.91.229.3 (2 Mar 2014 22:22:57 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Mar 2014 22:22:57 +0000 (UTC) Cc: esr@thyrsus.com, handa@gnu.org, Eli Zaretskii , emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 02 23:23:05 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WKEmk-0005Pg-UE for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 23:23:03 +0100 Original-Received: from localhost ([::1]:36843 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKEmk-0003xz-HN for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 17:23:02 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44871) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKEmd-0003wz-CM for emacs-devel@gnu.org; Sun, 02 Mar 2014 17:22:59 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKEmY-0008NP-RN for emacs-devel@gnu.org; Sun, 02 Mar 2014 17:22:55 -0500 Original-Received: from 209-20-69-211.slicehost.net ([209.20.69.211]:37837 helo=slice.rozzin.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKEmT-0008Lp-Ug; Sun, 02 Mar 2014 17:22:45 -0500 Original-Received: by slice.rozzin.com (Postfix, from userid 1000) id 06106C81E4; Sun, 2 Mar 2014 17:22:44 -0500 (EST) In-Reply-To: <87bnxogsbl.fsf@igel.home> (Andreas Schwab's message of "Sun, 02 Mar 2014 23:15:58 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 209.20.69.211 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170084 Archived-At: Andreas Schwab writes: > > Joshua Judson Rosen writes: > > > Why not just ask bzr to interpret the "111954.1.97" reference, > > Bzr revnos are useless without context. You need to ask on the original > branch, otherwise they are meaningless. Yes, that's what I said--and it's exactly what the commands I gave do. -- "'tis an ill wind that blows no minds." From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Mon, 03 Mar 2014 05:35:25 +0200 Message-ID: <831tykt0n6.fsf@gnu.org> References: <20140301171337.53CC638073E@snark.thyrsus.com> <8338j1vkta.fsf@gnu.org> <87fvn17gbc.fsf@slice.rozzin.com> <83ppm5tfsg.fsf@gnu.org> <87ob1pywn7.fsf@slice.rozzin.com> <83k3ccts3p.fsf@gnu.org> <8738j0ihjn.fsf@igel.home> <83bnxotk5o.fsf@gnu.org> <87k3ccgvc6.fsf@igel.home> <8338j0tho7.fsf@gnu.org> <87fvn0gsed.fsf@igel.home> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1393817748 14813 80.91.229.3 (3 Mar 2014 03:35:48 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 3 Mar 2014 03:35:48 +0000 (UTC) Cc: esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org, rozzin@geekspace.com To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Mar 03 04:35:56 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WKJfX-0007O1-LL for ged-emacs-devel@m.gmane.org; Mon, 03 Mar 2014 04:35:55 +0100 Original-Received: from localhost ([::1]:37599 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKJfW-0005qs-NQ for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 22:35:54 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53983) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKJfP-0005ql-Ng for emacs-devel@gnu.org; Sun, 02 Mar 2014 22:35:52 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKJfK-0001oF-Qm for emacs-devel@gnu.org; Sun, 02 Mar 2014 22:35:47 -0500 Original-Received: from mtaout25.012.net.il ([80.179.55.181]:36465) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKJfK-0001o4-Il; Sun, 02 Mar 2014 22:35:42 -0500 Original-Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0N1U00K00BWVOE00@mtaout25.012.net.il>; Mon, 03 Mar 2014 05:34:00 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N1U00BEMCKOY190@mtaout25.012.net.il>; Mon, 03 Mar 2014 05:34:00 +0200 (IST) In-reply-to: <87fvn0gsed.fsf@igel.home> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.181 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170085 Archived-At: > From: Andreas Schwab > Cc: rozzin@geekspace.com, esr@thyrsus.com, handa@gnu.org, emacs-devel@gnu.org > Date: Sun, 02 Mar 2014 23:14:18 +0100 > > >> >> revno:111954.1.97 refers to revno:112051, not revno:111964.1.6. > >> > > >> > Maybe so, but how did you determine that? > > It cannot be the on the same branch, since it's not a plain number > (handa@gnu.org-20130320075820-0qzn1jnrqj0y2g4m is on the same branch). Yes, that's true. I thought Eric wanted the original commit, even if it was on another branch. But if he wants the corresponding trunk commit, then yes, you are right. From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Eric S. Raymond" Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Sun, 2 Mar 2014 22:40:24 -0500 Organization: Eric Conspiracy Secret Labs Message-ID: <20140303034024.GA8371@thyrsus.com> References: <87fvn17gbc.fsf@slice.rozzin.com> <83ppm5tfsg.fsf@gnu.org> <87ob1pywn7.fsf@slice.rozzin.com> <83k3ccts3p.fsf@gnu.org> <8738j0ihjn.fsf@igel.home> <83bnxotk5o.fsf@gnu.org> <87k3ccgvc6.fsf@igel.home> <8338j0tho7.fsf@gnu.org> <87fvn0gsed.fsf@igel.home> <831tykt0n6.fsf@gnu.org> Reply-To: esr@thyrsus.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1393818062 17654 80.91.229.3 (3 Mar 2014 03:41:02 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 3 Mar 2014 03:41:02 +0000 (UTC) Cc: handa@gnu.org, emacs-devel@gnu.org, Andreas Schwab , rozzin@geekspace.com To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Mar 03 04:41:11 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WKJkd-0000zv-GZ for ged-emacs-devel@m.gmane.org; Mon, 03 Mar 2014 04:41:11 +0100 Original-Received: from localhost ([::1]:37639 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKJkd-0007XF-6d for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2014 22:41:11 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54884) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKJkX-0007UY-6a for emacs-devel@gnu.org; Sun, 02 Mar 2014 22:41:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKJkS-0003Wk-QU for emacs-devel@gnu.org; Sun, 02 Mar 2014 22:41:04 -0500 Original-Received: from static-71-162-243-5.phlapa.fios.verizon.net ([71.162.243.5]:41735 helo=snark.thyrsus.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKJkO-0003VZ-3h; Sun, 02 Mar 2014 22:40:56 -0500 Original-Received: by snark.thyrsus.com (Postfix, from userid 1000) id 12FB0380E1C; Sun, 2 Mar 2014 22:40:24 -0500 (EST) Content-Disposition: inline In-Reply-To: <831tykt0n6.fsf@gnu.org> X-Eric-Conspiracy: There is no conspiracy User-Agent: Mutt/1.5.21 (2010-09-15) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 71.162.243.5 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170086 Archived-At: Eli Zaretskii : > > It cannot be the on the same branch, since it's not a plain number > > (handa@gnu.org-20130320075820-0qzn1jnrqj0y2g4m is on the same branch). > > Yes, that's true. I thought Eric wanted the original commit, even if > it was on another branch. But if he wants the corresponding trunk > commit, then yes, you are right. I expect the trunk commit is what a person reading that comment would want to refer back to - but, as previously noted, the question gets a bit philosophical. -- Eric S. Raymond From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Mon, 03 Mar 2014 14:35:13 +0900 Message-ID: <87a9d7sv3i.fsf@uwakimon.sk.tsukuba.ac.jp> References: <87fvn17gbc.fsf@slice.rozzin.com> <83ppm5tfsg.fsf@gnu.org> <87ob1pywn7.fsf@slice.rozzin.com> <83k3ccts3p.fsf@gnu.org> <8738j0ihjn.fsf@igel.home> <83bnxotk5o.fsf@gnu.org> <87k3ccgvc6.fsf@igel.home> <8338j0tho7.fsf@gnu.org> <87fvn0gsed.fsf@igel.home> <831tykt0n6.fsf@gnu.org> <20140303034024.GA8371@thyrsus.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Trace: ger.gmane.org 1393824938 12812 80.91.229.3 (3 Mar 2014 05:35:38 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 3 Mar 2014 05:35:38 +0000 (UTC) Cc: handa@gnu.org, Eli Zaretskii , rozzin@geekspace.com, Andreas Schwab , emacs-devel@gnu.org To: esr@thyrsus.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Mar 03 06:35:45 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WKLXV-0005Tx-9W for ged-emacs-devel@m.gmane.org; Mon, 03 Mar 2014 06:35:45 +0100 Original-Received: from localhost ([::1]:37939 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKLXS-0006LM-C0 for ged-emacs-devel@m.gmane.org; Mon, 03 Mar 2014 00:35:42 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41987) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKLXI-0006F0-6X for emacs-devel@gnu.org; Mon, 03 Mar 2014 00:35:39 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKLXA-0002EZ-8F for emacs-devel@gnu.org; Mon, 03 Mar 2014 00:35:31 -0500 Original-Received: from mgmt2.sk.tsukuba.ac.jp ([130.158.97.224]:57420) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKLX2-0002E5-BH; Mon, 03 Mar 2014 00:35:16 -0500 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) by mgmt2.sk.tsukuba.ac.jp (Postfix) with ESMTP id C8BF49707EA; Mon, 3 Mar 2014 14:35:13 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id BD3291A28E5; Mon, 3 Mar 2014 14:35:13 +0900 (JST) In-Reply-To: <20140303034024.GA8371@thyrsus.com> X-Mailer: VM undefined under 21.5 (beta34) "kale" 2a0f42961ed4 XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 130.158.97.224 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170088 Archived-At: Eric S. Raymond writes: > I expect the trunk commit is what a person reading that comment > would want to refer back to - but, as previously noted, the > question gets a bit philosophical. Sure, but it's also pragmatic. The Emacs workflow does have a distinguished mainline. While Emacs developers often use branches privately, they communicate with each other about changes by merging to trunk, rather than by posting a branch URL. If this merge causes a problem, the fix is then committed to trunk. (In projects with a formalized workflow, this is often referred to as commit-and-review.) So, pragmatically, trunk is the obvious default point of reference unless explicitly specified otherwise -- and there're really nothing else that would serve. These references are also stable as long as appropriate push controls are in effect. I don't see any good reason for you to avoid that convention. From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Eric S. Raymond" Newsgroups: gmane.emacs.devel Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"? Date: Mon, 3 Mar 2014 00:49:25 -0500 Organization: Eric Conspiracy Secret Labs Message-ID: <20140303054922.GB9790@thyrsus.com> References: <87ob1pywn7.fsf@slice.rozzin.com> <83k3ccts3p.fsf@gnu.org> <8738j0ihjn.fsf@igel.home> <83bnxotk5o.fsf@gnu.org> <87k3ccgvc6.fsf@igel.home> <8338j0tho7.fsf@gnu.org> <87fvn0gsed.fsf@igel.home> <831tykt0n6.fsf@gnu.org> <20140303034024.GA8371@thyrsus.com> <87a9d7sv3i.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: esr@thyrsus.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1393825775 20796 80.91.229.3 (3 Mar 2014 05:49:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 3 Mar 2014 05:49:35 +0000 (UTC) Cc: handa@gnu.org, Eli Zaretskii , emacs-devel@gnu.org, Andreas Schwab , rozzin@geekspace.com To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Mar 03 06:49:44 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WKLl1-00052v-Fx for ged-emacs-devel@m.gmane.org; Mon, 03 Mar 2014 06:49:43 +0100 Original-Received: from localhost ([::1]:37962 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKLl0-0002N1-Sc for ged-emacs-devel@m.gmane.org; Mon, 03 Mar 2014 00:49:42 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43436) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKLkt-0002MI-5I for emacs-devel@gnu.org; Mon, 03 Mar 2014 00:49:39 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKLko-0005ic-Tt for emacs-devel@gnu.org; Mon, 03 Mar 2014 00:49:35 -0500 Original-Received: from static-71-162-243-5.phlapa.fios.verizon.net ([71.162.243.5]:43159 helo=snark.thyrsus.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKLkk-0005iI-7j; Mon, 03 Mar 2014 00:49:26 -0500 Original-Received: by snark.thyrsus.com (Postfix, from userid 1000) id 3A9E5380E1C; Mon, 3 Mar 2014 00:49:25 -0500 (EST) Content-Disposition: inline In-Reply-To: <87a9d7sv3i.fsf@uwakimon.sk.tsukuba.ac.jp> X-Eric-Conspiracy: There is no conspiracy User-Agent: Mutt/1.5.21 (2010-09-15) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 71.162.243.5 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:170089 Archived-At: Stephen J. Turnbull : > Eric S. Raymond writes: > > > I expect the trunk commit is what a person reading that comment > > would want to refer back to - but, as previously noted, the > > question gets a bit philosophical. > > Sure, but it's also pragmatic. The Emacs workflow does have a > distinguished mainline. While Emacs developers often use branches > privately, they communicate with each other about changes by merging > to trunk, rather than by posting a branch URL. If this merge causes a > problem, the fix is then committed to trunk. (In projects with a > formalized workflow, this is often referred to as commit-and-review.) > > So, pragmatically, trunk is the obvious default point of reference > unless explicitly specified otherwise -- and there're really nothing > else that would serve. These references are also stable as long as > appropriate push controls are in effect. > > I don't see any good reason for you to avoid that convention. Not trying to. In my current lift script the patch for that reference does point to the trunk commit. -- Eric S. Raymond