Handling repeated text annotations

[Robert Collins]

On Wed, 2008-02-13 at 17:07 -0600, John Arbash Meinel wrote:

> I'll try using heads() though I'm not sure it is exposed easily down
> at this
> level :(. I'm a little concerned that all the heads calls are going to
> kill
> performance. But I guess we only have to do it for lines that seem to
> claim 2
> parents.

When you merge a line from another text, it should not get a new
version, so when you have two branches join, no changes on either side
will not be a merge.

BUT - if one side changes, then you have two versions - the unchanged
and the changed. 

So yes, heads() is indeed the key to not showing 'merges' where its
really just one side doing edits.

-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080214/97adbb41/attachment-0001.pgp