[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-devel] Monotone VIM 3-way merging fixes.
From: |
Matthew A. Nicholson |
Subject: |
[Monotone-devel] Monotone VIM 3-way merging fixes. |
Date: |
Wed, 03 Aug 2005 10:53:57 -0500 |
User-agent: |
Debian Thunderbird 1.0.6 (X11/20050801) |
The attached patch contains fixes for vim 3-way and 2-way merging. Like
meld, the current version of vim has limits on it's merging
functionality. This patch works around those.
--
Matthew A. Nicholson
Digium
#
# patch "std_hooks.lua"
# from [a155f905ed9e742f02ad6648546080b4e33719a4]
# to [fd05c10e0f76992b9d421714d4430c9ae5c341f8]
#
===============================================
--- std_hooks.lua a155f905ed9e742f02ad6648546080b4e33719a4
+++ std_hooks.lua fd05c10e0f76992b9d421714d4430c9ae5c341f8
@@ -363,6 +363,9 @@
cmd = merge2_emacs_cmd ("emacs", lfile, rfile, outfile)
end
elseif string.find(editor, "vim") ~= nil then
+ io.write (string.format("\nWARNING: 'vim' was choosen to perform
external 2-way merge.\n"..
+ "You should merge all changes to *LEFT* file due to limitation of
program\n"..
+ "arguments.\n\n"))
if os.getenv ("DISPLAY") ~= nil and program_exists_in_path ("gvim") then
cmd = merge2_vim_cmd ("gvim", lfile, rfile, outfile)
elseif program_exists_in_path ("vim") then
@@ -450,10 +453,13 @@
cmd = merge3_emacs_cmd ("emacs", lfile, afile, rfile, outfile)
end
elseif string.find(editor, "vim") ~= nil then
+ io.write (string.format("\nWARNING: 'vim' was choosen to perform
external 2-way merge.\n"..
+ "You should merge all changes to *LEFT* file due to limitation of
program\n"..
+ "arguments. The order of the files is ancestor, left, right.\n\n"))
if os.getenv ("DISPLAY") ~= nil and program_exists_in_path ("gvim") then
- cmd = merge3_vim_cmd ("gvim", lfile, afile, rfile, outfile)
+ cmd = merge3_vim_cmd ("gvim", afile, lfile, rfile, outfile)
elseif program_exists_in_path ("vim") then
- cmd = merge3_vim_cmd ("vim", lfile, afile, rfile, outfile)
+ cmd = merge3_vim_cmd ("vim", afile, lfile, rfile, outfile)
end
elseif program_exists_in_path ("meld") then
tbl.meld_exists = true
- [Monotone-devel] Monotone VIM 3-way merging fixes.,
Matthew A. Nicholson <=