Handling repeated text annotations

[John Arbash Meinel]

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


...

|> So I'm tempted to do "heads()" for correctness, but I'm not sure if we
|> win much
|> versus left-wins or right-wins. Isn't it more useful to see the log
|> message of
|> one of the nodes that created that line, rather than the node that
|> merges the
|> identical texts together?
|
|> I suppose we also need to consider the effects on annotate-merge. As
|> right/left-wins might produce more conflicts than a heads() based solution.
|
| 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.
|
| Aaron

Well, this would still effect that. Because if 2 sides introduce the same text,
heads will say that it *was* introduced in THIS (because there was a
disagreement between left and right about this line.)
right/left-wins will say it was only from an ancestor.

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

iD8DBQFHtKPlJdeBCYSNAAMRArBYAJ9Cm7FbBzuHSQxKxcySfgZveZTT0ACdEhql
HmUkyNwoKJVpXchTbxUYNm8=
=UTd4
-----END PGP SIGNATURE-----