From: Joshua Judson Rosen <rozzin@geekspace.com>
To: esr@thyrsus.com
Cc: handa@gnu.org, Eli Zaretskii <eliz@gnu.org>, emacs-devel@gnu.org
Subject: Re: Can anyone correct the Bazaar reference "revno:111954.1.97"?
Date: Sat, 01 Mar 2014 22:47:52 -0500 [thread overview]
Message-ID: <87eh2l5kif.fsf@slice.rozzin.com> (raw)
In-Reply-To: <20140301220207.GC19461@thyrsus.com> (Eric S. Raymond's message of "Sat, 1 Mar 2014 17:02:07 -0500")
"Eric S. Raymond" <esr@thyrsus.com> 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."
next prev parent reply other threads:[~2014-03-02 3:47 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-01 17:13 Can anyone correct the Bazaar reference "revno:111954.1.97"? Eric S. Raymond
2014-03-01 18:24 ` Eli Zaretskii
2014-03-01 18:43 ` Eric S. Raymond
2014-03-01 21:35 ` Joshua Judson Rosen
2014-03-01 22:02 ` Eric S. Raymond
2014-03-02 3:47 ` Joshua Judson Rosen [this message]
2014-03-02 17:44 ` Eli Zaretskii
2014-03-02 18:26 ` Andreas Schwab
2014-03-02 20:01 ` Policy on referencing/abbreviating git commit-IDs, going forward? (was: Can anyone correct the Bazaar reference "revno:111954.1.97"?) Joshua Judson Rosen
2014-03-02 20:30 ` Policy on referencing/abbreviating git commit-IDs, going forward? Andreas Schwab
2014-03-02 21:18 ` Joshua Judson Rosen
2014-03-02 20:35 ` Can anyone correct the Bazaar reference "revno:111954.1.97"? Eli Zaretskii
2014-03-02 21:08 ` Andreas Schwab
2014-03-02 3:53 ` Eli Zaretskii
2014-03-02 3:55 ` Eli Zaretskii
2014-03-02 5:53 ` Joshua Judson Rosen
2014-03-02 17:42 ` Eli Zaretskii
2014-03-02 18:25 ` Andreas Schwab
2014-03-02 20:33 ` Eli Zaretskii
2014-03-02 21:10 ` Andreas Schwab
2014-03-02 21:27 ` Eli Zaretskii
2014-03-02 22:14 ` Andreas Schwab
2014-03-03 3:35 ` Eli Zaretskii
2014-03-03 3:40 ` Eric S. Raymond
2014-03-03 5:35 ` Stephen J. Turnbull
2014-03-03 5:49 ` Eric S. Raymond
2014-03-02 19:08 ` Joshua Judson Rosen
2014-03-02 20:38 ` Eli Zaretskii
2014-03-02 22:00 ` Joshua Judson Rosen
2014-03-02 22:15 ` Andreas Schwab
2014-03-02 22:22 ` Joshua Judson Rosen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87eh2l5kif.fsf@slice.rozzin.com \
--to=rozzin@geekspace.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=esr@thyrsus.com \
--cc=handa@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.