|
|
@@ -593,7 +593,7 @@ Index: roster_merge.cc
|
|
|
===================================================================
|
|
|
Index: std_hooks.lua
|
|
|
--- std_hooks.lua 9fd3160c435eff59acc8622875047304e3472b9c
|
|
|
-+++ std_hooks.lua daa4c14ed6e56a68a145b8a0baf6e28ae5230940
|
|
|
++++ std_hooks.lua ad10b3627e6bdb4124ee553843ee9552ea41fb87
|
|
|
@@ -284,6 +284,15 @@ function edit_comment(basetext, user_log
|
|
|
if user_log_message == "" or string.sub(user_log_message, -1) ~= "\n" then
|
|
|
tmp:write("\n")
|
|
|
@@ -754,37 +754,37 @@ Index: std_hooks.lua
|
|
|
+ -- upgrade current branch by merging in revisions of base branch
|
|
|
+ local rc = execute("mtn", "propagate", branch_base, branch_this)
|
|
|
+ if rc ~= 0 then
|
|
|
-+ io.stderr:write("mtn: revision: ERROR: failed to execute \"mtn propagate\"\n")
|
|
|
++ io.stderr:write("mtn: base: ERROR: failed to execute \"mtn propagate\"\n")
|
|
|
+ return
|
|
|
+ end
|
|
|
+ rc = execute("mtn", "update")
|
|
|
+ if rc ~= 0 then
|
|
|
-+ io.stderr:write("mtn: revision: ERROR: failed to execute \"mtn update\"\n")
|
|
|
++ io.stderr:write("mtn: base: ERROR: failed to execute \"mtn update\"\n")
|
|
|
+ return
|
|
|
+ end
|
|
|
+ elseif op == "diff" then
|
|
|
+ -- upgrade current branch by merging in revisions of base branch
|
|
|
+ local rc = execute("mtn", "diff", "-r", "h:" .. branch_base, "-r", "h:" .. branch_this)
|
|
|
+ if rc ~= 0 then
|
|
|
-+ io.stderr:write("mtn: revision: ERROR: failed to execute \"mtn diff\"\n")
|
|
|
++ io.stderr:write("mtn: base: ERROR: failed to execute \"mtn diff\"\n")
|
|
|
+ return
|
|
|
+ end
|
|
|
+ end
|
|
|
+ return
|
|
|
+end
|
|
|
+
|
|
|
-+-- extra command: "mtn setup-local"
|
|
|
++-- extra command: "mtn init"
|
|
|
+register_command(
|
|
|
-+ "setup-local", "BRANCH",
|
|
|
++ "init", "BRANCH",
|
|
|
+ "Place local directory under local version control.",
|
|
|
+ "Creates a new _MTN/mtn.db database and places the local " ..
|
|
|
+ "directory tree under version control using this database.",
|
|
|
-+ "command_setup_local"
|
|
|
++ "command_init"
|
|
|
+)
|
|
|
-+function command_setup_local(branch)
|
|
|
++function command_init(branch)
|
|
|
+ -- sanity check command line
|
|
|
+ if branch == nil then
|
|
|
-+ io.stderr:write("mtn: setup-local: ERROR: no branch specified\n")
|
|
|
++ io.stderr:write("mtn: init: ERROR: no branch specified\n")
|
|
|
+ return
|
|
|
+ end
|
|
|
+
|
