Avoiding conflicts in .hgtags

[Brendan Cully]

On Monday, 08 December 2008 at 16:41, Peter Arrenbrecht wrote:
> On Mon, Dec 8, 2008 at 4:15 PM, Greg Ward <gerg.ward+hg at gmail.com> wrote:
> >  You can tag any changeset you like, but you should only create tags
> >  (i.e. modify .hgtags) on the trunk and then merge that modification
> >  to all active branches.
> >
> > Thoughts?
> 
> I think Mercurial should have a specialized merger for such files.
> There are others, like .hgsigs, and there will be more, like
> .hgsubrepo, etc.

More than a year ago, Alexis wrote an automatic merger for hgtags. I
believe this preceded the new merge infrastructure, which should make
it much easier to plug in as a script.

The message was:

From: "Alexis S. L. Carvalho" <alexis at cecm.usp.br> 
Subject: [RFC PATCH] Automatic merging of .hgtags
Date: Wed, 11 Jul 2007 22:17:33 -0300
Message-ID: <20070712011733.GA26806 at cecm.usp.br>

I think it could probably be simplified, but it should work if any one
wants to try it.