Merging Tags

[Roman Kennke]

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

Cheers, Roman

-- 
Dipl.-Inform. (FH) Roman Kennke, Software Engineer, http://kennke.org
aicas Allerton Interworks Computer Automated Systems GmbH
Haid-und-Neu-Straße 18 * D-76131 Karlsruhe * Germany
http://www.aicas.com   * Tel: +49-721-663 968-0
USt-Id: DE216375633, Handelsregister HRB 109481, AG Karlsruhe
Geschäftsführer: Dr. James J. Hunt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: hgtagsmerge.py
Type: text/x-python
Size: 2707 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20080527/24a34f53/attachment-0003.py>