Avoiding conflicts in .hgtags

[Arne Babenhauserheide]

Am Freitag 12 Dezember 2008 17:05:07 schrieb Greg Ward:
> Because .hgtags is *not* an append/remove-only file: tags can be
> changed.  The trick is that it *is* a context-free file; you can merge
> three copies of .hgtags by looking at each tag in isolation from the
> others.  Because the merge is content-based rather than textual, you
> should only get conflicts when there is a real conflict.  (E.g. you and
> I both modify a tag to point to a different changeset, or you modify it
> and I delete it.)

Ah, I see it. Thanks! 

> It does seem that there ought to be one merge algorithm for all these
> special .hg* files, but I don't know what it is.  Maybe it's not
> possible.

I rather think that Mercurial could come with default mergeers for each of the 
special files, and that some files could share mergers. 

Best wishes, 
Arne
-- 
-- My stuff: http://draketo.de - stories, songs, poems, programs and stuff :)
-- Infinite Hands: http://infinite-hands.draketo.de - singing a part of the 
history of free software.
-- Ein Würfel System: http://1w6.org - einfach saubere (Rollenspiel-) Regeln.

-- PGP/GnuPG: http://draketo.de/inhalt/ich/pubkey.txt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20081212/d1ed748f/attachment-0001.asc>