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

[Christof Petig]

Derek Scherger schrieb:
> This patch adds support for xemacs to the merge2 and merge3 hooks and 
> support for the merge command included with the gnu rcs package to the 
> merge3 hook which allows for cvs style merges with conflict markers.
>
> Note that using the rcs merge command will commit a file with conflict 
> markers requiring further edits to resolve the conflict. CVS users 
> should be familiar with editing files that contain these conflict markers.
>
> It also fixes bug 8550 and issues a message if no external merge tools 
> are available.

I really liked this patch, patch didn't :-(

So here is the non MUA garbled variant of it (perhaps me applying by 
hand distorted some white space).

It is a shame that people developing a distributed version control 
system exchange and apply patches by hand ... any ideas on how to make 
this more efficient, Graydon?

Perhaps a public monotone server with a web/mail driven key validation 
interface?

   Christof

merge_xemacs.patch.gz
Description: GNU Zip compressed data