.hgtags and merge

Teemu Torma teemu at torma.org
Wed Dec 20 19:50:53 CST 2006


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.

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).

Has this issue been raised before, or am I missing something.  I am 
quite new to mercurial and still mostly evaluating it for an old large 
scale project to replace CVS.

Teemu


More information about the Mercurial mailing list