[MERGE][bug #232188] Simple update to annotate

[John Arbash Meinel]

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

This is an alternative to my "annotation policy" patch, which also will
"fix" bug #232188. It is significantly similar, and probably good enough.

The basic issue is that when merging, both sides might claim to have
modified a line to exactly the same text. We can't (yet?) mark that line
as modified in both revisions, so we have to pick one. Our current
choice fits what we do for InventoryFile.revision (pick the merge
revision), but it is unhelpful for 'annotate' because you probably
didn't actually modify the file in that merge.

I ended up going with the lexicographically first revision_id, because
that is stable (A merging B gives the same result as B merging A), and
as discussed earlier, there isn't really a universal truth as to what it
*should* be annotated as.

I would still like to get the annotation policy stuff finished at some
point, but I feel like I'm missing the simple fix for one that isn't
going to be finished soon.

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

iEYEARECAAYFAkiPTPcACgkQJdeBCYSNAAPx1ACdFM8luWzSbRq30PqHgFT7hM+c
2B4An1vsULBdslGLgaT1V0mRCBLpIy6d
=1s34
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: simple_annotate_232188.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20080729/317223b8/attachment.diff