[ANN] tagmerge - an extension for merging .hgtags

Greg Ward greg-hg at gerg.ca
Thu Feb 18 20:47:09 CST 2010


On Thu, Feb 18, 2010 at 2:34 PM, Qi Yang <qi.yang137 at gmail.com> wrote:
> Thanks, Greg and Benoit for your suggestions. They are vey helpful.
>
> I made some changes in tagmerge to use "findglobaltag" and "_readtag" for
> reading tags. It was successful. I updated it under
>
> https://q6yang@bitbucket.org/q6yang/tagmerge/
>
> However, when i do write tag using "tag()" in localrepo.py It always gets
> locked. Did I use this method wrong?

1) I presume 'tagmerge' is an external script that hg runs like any
other merge tool: correct?
2) from the stack trace, it looks like tagmerge is trying to add a new
tag. That requires committing. But you're in the middle of a merge!
Presumably the 'hg' process doing the merge holds a lock which
tagmerge then tries to get in order to commit.  No wonder it doesn't
work.

So why is tagmerge trying to commit?  Merge tools should just write to
the working directory.

Greg


More information about the Mercurial-devel mailing list