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."