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

[Matt Mackall]

On Mon, 2011-04-04 at 09:25 -0400, Greg Ward wrote:
> 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.

You definitely don't want to discard/compress tag information during a
merge. Because as soon as you merge with a third head, you're going to
need that info again.

-- 
Mathematics is the supreme nostalgia of our time.