Merging Tags

[Adrian Buehlmann]

On 27.05.2008 16:33, Roman Kennke wrote:
> Hi,
> 
> I've implemented a merge wrapper to merge .hgtags files. It tries to
> merge .hgtags conflicts without interaction when possible. I attach this
> wrapper, please have a look, I'd be happy about feedback. Maybe you'd
> like to include it in Mercurial?
> 
> Is the only mechanism to integrate such a merge wrapper by setting
> HGMERGE to point to the script? I find this slightly inconvenient,
> because I want to fall back to whatever should be used otherwise
> (hgmerge usually, but could be something different). Now I simply launch
> hgmerge when I can't merge the stuff automatically.
> 
> The optimal solution I could think of would be to have something like
> merge extensions, where each extension must be able to tell if it can
> merge files or not (probably based on filename extension or by examining
> the contents), and HG simply goes through the list and tries all the
> mergers. Additionally, each such merge extension should have a priority,
> so that HG can go through this list in an ordered fashion. Does
> something like this exist? If not, does something like this make sense
> to implement? Would be very cool to have mergers that can merge based on
> the semantics of files (i.e. special mergers for Python, yay!)

Did you see http://www.selenic.com/mercurial/wiki/index.cgi/MergeToolConfiguration ?

It allows things like:

'''
[merge-patterns]
**.jpg = myimgmerge
**.exe = internal:fail
'''