[Monotone-devel] [PATCH] More verbose error message for merge

[Richard Li]

Hi,

In upgrading from 0.18 to 0.21 I spent a few minutes trying to figure 
out why I kept on getting "no external 3-way merge command found" errors.

Attached is a patch for a more explicit error message.

Please review and apply as appropriate.

Richard

# 
# patch "std_hooks.lua"
#  from [fd05c10e0f76992b9d421714d4430c9ae5c341f8]
#    to [4948b0bd7f95c210458b10105fe671dae7a5e81b]
# 
===============================================
--- std_hooks.lua       fd05c10e0f76992b9d421714d4430c9ae5c341f8
+++ std_hooks.lua       4948b0bd7f95c210458b10105fe671dae7a5e81b
@@ -417,7 +417,10 @@
             ret = nil 
          end
       else
-         io.write ("no external 2-way merge command found\n")
+         io.write (string.format("No external 2-way merge command found.\n"..
+            "You may want to check that $EDITOR is set to an editor that 
supports 2-way merge,\n"..
+            "set this explicitly in your get_preferred_merge2_command 
hook,\n"..
+            "or add a 2-way merge program to your path.\n\n"))
       end
    end
 
@@ -509,7 +512,10 @@
             ret = nil 
          end
       else
-         io.write ("no external 3-way merge command found\n")
+         io.write (string.format("No external 3-way merge command found.\n"..
+            "You may want to check that $EDITOR is set to an editor that 
supports 3-way merge,\n"..
+            "set this explicitly in your get_preferred_merge3_command 
hook,\n"..
+            "or add a 3-way merge program to your path.\n\n"))
       end
    end