[Monotone-devel] Re: Monotone merge support for external tools

[Bruce Stephens]

Tom Koelman <address@hidden> writes:

> the merge2 and merge3 hooks currently only provide path and file
> content information. Wouldn't it be nice if they also provided
> revision id and file ids? An external merge tool that would want to
> provide support for monotone would then be able to access the
> certificates of the files to be merged, thus being able to tell a
> user which file is which (personally, I always get confused about
> this).

That would be useful.  (Even better would be to have working copy
merging, but that's presumably much more work.)  

I'd guess a good way to do this would be just to have monotone provide
tables of the certificates of each version.  That ought to be
reasonably efficient, since you only have to do it once for the whole
tree.

I doubt a merge tool is going to want to use anything other than that
information, and that would be really useful.  (If a file is a working
copy file, then the table would be empty, I guess.  Or maybe it has
the certificates associated with the base revision, and a special one
indicating that it's the working copy version.)

[...]