Incorrect results from annotate on packs

Aaron Bentley aaron at aaronbentley.com
Sun Dec 30 01:47:24 GMT 2007


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

Robert Collins wrote:
> On Sat, 2007-12-29 at 03:14 -0500, Aaron Bentley wrote:
>> Well, I don't.  My research shows that the ancestry of this line is
>> quite complicated.  I've attached a DAG in dot and SVG format, as well
>> as the patch I used to generate it.
>>
>> But to me it looks like the line was originated in four different
>> revisions, and until revno 3052, we never reached synchronization.
> 
> I'd *really* love it if we could list these rather than attributing to
> the merging revision.

I'm open to changing it, I just want to be careful.

Now, are you saying you'd like an annotate interface that could list
multiple originating versions?  Or just pick one?

And why do we use the merging version for files?  Does that rationale
apply to lines as well?

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHdvis0F+nu1YWqI0RApCCAJ9hdKf957QrfJt+EBMl5sUz6sAJswCfUkXw
FAO0+h/9D7wc4PLp+0DAVyg=
=volv
-----END PGP SIGNATURE-----



More information about the bazaar mailing list