.hgtags and merge

[Matt Mackall]

On Thu, Dec 21, 2006 at 02:50:53AM +0100, Teemu Torma wrote:
> I had an issue few days ago about merging .hgtags.  
> 
> This was the mercurial repository itself.  I had added a tag into my 
> repository, not local one since I needed to share it between other 
> local hosts.  When I pulled the mercurial again the 0.9.2 tag was added  
> and merge of .hgtags conflicted.

This is the intended behavior.

> 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?

-- 
Mathematics is the supreme nostalgia of our time.