Handling repeated text annotations

[Aaron Bentley]

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

John Arbash Meinel wrote:

> | We don't currently perform true annotate merges.  --knit just uses
> | newness information: "Was line x present in any ancestor, or was it
> | introduced by this revision?"
> |
> | So if you want, I can think about it, but I don't think it's strictly
> | relevant.

> Well, this would still effect that.

We don't do annotate merges any more.  Instead of using annotations, we
do sequence matching and set operations.  So changes to the annotate
code will not affect merge --knit at all.

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

iD8DBQFHtMFI0F+nu1YWqI0RApvPAJ42WN/QhF3cw2H4/XqUtRTGizAKcgCdE2zm
E0kAATjKnSbVfIfKBPvtpmc=
=CM/9
-----END PGP SIGNATURE-----