[ANN] tagmerge - an extension for merging .hgtags
Benoit Boissinot
benoit.boissinot at ens-lyon.org
Sat Feb 13 17:02:17 CST 2010
On Thu, Feb 04, 2010 at 12:30:26AM -0500, Qi Yang wrote:
> Hello:
>
> The following is the link to an extension I wrote for merging .hgtags file.
>
> https://q6yang@bitbucket.org/q6yang/tagmerge/
>
> This extension will add non-local tags to local .hgtags file when tags are
> not conflict ( same tag name with different changeset ). It will call merge
> tool (or call simplemerge when no merge tool is defined) when there are
> conflict tags.
I just remember it, but you should have a look at some earlier work from
Alexis:
http://markmail.org/message/53aqcryrjgtm3l2k
It surely needs some work to be ported to the current infrastructure,
but it could be a great starting point!
cheers,
Benoit
--
:wq
More information about the Mercurial-devel
mailing list