.hgtags and merge

[Teemu Torma]

On Thursday 21 December 2006 03:22, Matt Mackall wrote:
> > My first thought is that .hgtags should have a special merge
> > treatment to simply combine all possible tags instead of "normal"
> > merge processing (could be handled my the merge script, of course).
>
> Then what happens when tags conflict?

In my case they did not, different tags for different changesets, just 
the same line in the .hgtags file.

I think you can have multiple tags for one changeset, so that should not 
be a problem, and if I understand correctly from other mails, same tag 
for different changesets is already possible.  Just combine unique 
lines from both files should be enough?

Teemu