[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] [PATCH] add xemacs and rcs merge commands to lua me
From: |
Nathaniel Smith |
Subject: |
Re: [Monotone-devel] [PATCH] add xemacs and rcs merge commands to lua merge2/merge3 hooks; fix bug 8550 |
Date: |
Mon, 19 Apr 2004 23:53:08 -0700 |
User-agent: |
Mutt/1.5.5.1+cvs20040105i |
On Mon, Apr 19, 2004 at 11:09:34PM -0600, Derek Scherger wrote:
> @@ -239,10 +241,14 @@
> outfile ~= nil
> then
> local cmd = nil
> - if program_exists_in_path("xxdiff") then
> + if program_exists_in_path("merge") then
> + cmd = merge3_merge_cmd(lfile, afile, rfile, outfile)
> + elseif program_exists_in_path("xxdiff") then
> cmd = merge3_xxdiff_cmd(lfile, afile, rfile, outfile)
> elseif program_exists_in_path("emacs") then
> - cmd = merge3_emacs_cmd(lfile, afile, rfile, outfile)
> + cmd = merge3_emacs_cmd("emacs", lfile, afile, rfile, outfile)
> + elseif program_exists_in_path("xemacs") then
> + cmd = merge3_emacs_cmd("xemacs", lfile, afile, rfile, outfile)
> end
Erm, I'm kinda dubious about making CVS-style conflict markers the
distribution default. Especially since as things stand, they would
also become the default for in-repository merges, where it isn't clear
they're a good idea at _all_.
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'?
-- Nathaniel
--
"Of course, the entire effort is to put oneself
Outside the ordinary range
Of what are called statistics."
-- Stephan Spender