Re: Can anyone correct the Bazaar reference "revno:111954.1.97"?

[Eli Zaretskii]

> From: Joshua Judson Rosen <address@hidden>
> Cc: Eli Zaretskii <address@hidden>,  address@hidden,  address@hidden
> 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.