Handling repeated text annotations

[Aaron Bentley]

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

John Arbash Meinel wrote:
> Aaron Bentley wrote:
> | 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.

> So does that mean the case of:
> 
> ~ A
> ~ |\
> ~ B AC
> ~ |\|
> ~ | BC
> ~ | |
> ~ | AC
> 
> Will do the "wrong" thing? (you merge B but revert it in favor of A.

We will determine that A is new in the last revision.

> I suppose it might depend on what base you pick.

merge --knit doesn't use bases for text merging.  It compares each
revision to its ancestors recursively until it hits a common ancestor.

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

iD8DBQFHtNeW0F+nu1YWqI0RAgwYAJwPzJ8jiepQEC4Xah1k5+7zMHo98wCfVCZ/
1gQ1s36/0moCOGxJAl1lmGo=
=QxNx
-----END PGP SIGNATURE-----