[bug 277537] [REVIEW] A highly specific reconcile

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Vincent Ladeuil wrote:
> Hi all,
> 
> This needs to be reviewed without BB support (it's a plugin, not
> a patch against bzr itself), please keep that in mind if you want
> to track it.
> 
> Bug https://bugs.launchpad.net/bzr/+bug/277537 is about a
> repository in which some file revisions have inconsistent
> parents.

So one thing Martin and I discussed. What if the actual bug is that
'annotate' is assuming that it can re-use 'left-matching-blocks' but for
the nodes with the parent-ids mixed up, it is actually applying them to
the wrong parent.

Consider if the 'compression_parent' was the right-hand parent, rather
than the left. Then annotate would be re-using the 'matching blocks'
incorrectly.

That said, with my quick attempts at debugging the per-file graph that
I've seen, I don't see any cases where 'compression_parent !=
parent_ids[0]'.

Then again, if what Vincent has done 'fixes' annotate, it sounds like it
might be getting things backwards somehow. We could tell by just
disabling the matching blocks code. It makes annotate slower, but it
should be 'correct'.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkj3v5oACgkQJdeBCYSNAAPpOACeN+57lLegUi305jMHrtFCwA39
h1QAnjTsF9otuOok5NHc2yJ2tlFsdxbs
=H0RW
-----END PGP SIGNATURE-----