[Monotone-devel] Re: [PATCH] add xemacs and rcs merge commands to lua merge2/merge3 hooks; fix bug 8550

[graydon hoare]

Nathaniel Smith wrote:

> How about just putting the hook in there so people can enable it if
> they want, and also letting the merge hooks know whether they're
> dealing with a 'merge' or an 'update'?

agreed. the hook should be modified to know which sort of merge it's 
doing (either a separate hook defined, or a boolean parameter, or a 
string naming the merge scenario, or something). it probably shouldn't 
call this merge-with-conflict-markers thing in cases where it'll be 
writing back to the database immediately.

the hook interface for merging isn't set in stone; I'll happily 
entertain ideas on how to make it better. I know for example some people 
have suggested passing some metadata (certs) to the hook to make it 
easier to create useful window titles, warning / progress messages, or 
filenames. that's feasible too.

otherwise the xemacs stuff looks fine. I notice KDE has a nice merge 
resolver too, and there's a tortoise one for windows.. probably we ought 
to sniff around for these and see if we can run them, too.

-graydon