Change order of lines in .hgtags to alleviate merge conflicts?

Greg Ward greg at gerg.ca
Mon Apr 4 08:25:02 CDT 2011


On 03 April 2011, Martin Geisler said:
> Instead of sorting the lines as you suggest, I think we should let
> Mercurial merge the .hgtags files itself, probably using the algorithm
> it already uses when merging the .hgtags files read from different
> heads. So if I do

Hmmmm.  Will that work?  The tag-reading code deliberately discards
information in order to establish a mapping from tag to changeset ID.
Is that safe to do when merging .hgtags from different branches? You'd
lose all the implicit history of how tag 'foo' was moved then deleted
then recreated.  But maybe that doesn't matter.

If it works, it would be a great reuse of code, and would make
.hgtags easier for a human to understand after merging.  *If* it
works...

        Greg
-- 
Greg Ward                                http://www.gerg.ca/
I am deeply CONCERNED and I want something GOOD for BREAKFAST!


More information about the Mercurial-devel mailing list