OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Jul-2008 12:12:10
Branch: HEAD Handle: 2008070511120900
Modified files:
openpkg-src/monotone monotone.patch.rse monotone.spec
Log:
fix error output on 'mtn base' and rename 'mtn setup-local' to 'mtn
init'
Summary:
Revision Changes Path
1.9 +9 -9 openpkg-src/monotone/monotone.patch.rse
1.38 +1 -1 openpkg-src/monotone/monotone.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/monotone/monotone.patch.rse
============================================================================
$ cvs diff -u -r1.8 -r1.9 monotone.patch.rse
--- openpkg-src/monotone/monotone.patch.rse 8 May 2008 21:28:29 -0000
1.8
+++ openpkg-src/monotone/monotone.patch.rse 5 Jul 2008 10:12:09 -0000
1.9
@@ -593,7 +593,7 @@
===================================================================
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 @@
+ -- 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
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/monotone/monotone.spec
============================================================================
$ cvs diff -u -r1.37 -r1.38 monotone.spec
--- openpkg-src/monotone/monotone.spec 8 May 2008 21:28:29 -0000
1.37
+++ openpkg-src/monotone/monotone.spec 5 Jul 2008 10:12:09 -0000
1.38
@@ -32,7 +32,7 @@
Group: SCM
License: GPL
Version: 0.40
-Release: 20080508
+Release: 20080705
# package options
%option with_rse yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
