OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 13-May-2009 12:29:35
Branch: HEAD Handle: 2009051311293500
Modified files:
openpkg-src/monotone monotone.patch.rse monotone.spec
Log:
upgrading package: monotone 0.43 -> 0.44
Summary:
Revision Changes Path
1.15 +17 -17 openpkg-src/monotone/monotone.patch.rse
1.45 +2 -2 openpkg-src/monotone/monotone.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/monotone/monotone.patch.rse
============================================================================
$ cvs diff -u -r1.14 -r1.15 monotone.patch.rse
--- openpkg-src/monotone/monotone.patch.rse 10 Apr 2009 12:52:34 -0000
1.14
+++ openpkg-src/monotone/monotone.patch.rse 13 May 2009 10:29:35 -0000
1.15
@@ -287,12 +287,12 @@
if (next > 0)
===================================================================
Index: cmd_netsync.cc
---- cmd_netsync.cc daaee53881abbda9c400148f4870098cb03508de
-+++ cmd_netsync.cc cb4c46302f39a871546056d5c082484d9ac95449
-@@ -266,7 +266,11 @@ CMD(pull, "pull", "", CMD_REF(network),
+--- cmd_netsync.cc 8bfd914c3727818036e83c65f72cff22cca86222
++++ cmd_netsync.cc 62e691118436783783090de567c4504b34842604
+@@ -258,7 +258,11 @@ CMD(pull, "pull", "", CMD_REF(network),
args, info, false);
- if (app.opts.signing_key() == "")
+ if (!keys.have_signing_key())
+#if defined(RSE) /* cosmetics-netsync */
+ P(F("doing anonymous pull"));
+#else
@@ -301,7 +301,7 @@
run_netsync_protocol(app.opts, app.lua, project, keys,
client_voice, sink_role, info);
-@@ -370,9 +374,16 @@ CMD(clone, "clone", "", CMD_REF(network)
+@@ -362,9 +366,16 @@ CMD(clone, "clone", "", CMD_REF(network)
// paths.cc's idea of the current workspace root is wrong at this point
if (internal_db)
@@ -318,10 +318,10 @@
// this is actually stupid, but app.opts.branch must be set here
// otherwise it will not be written into _MTN/options, in case
-@@ -397,7 +408,11 @@ CMD(clone, "clone", "", CMD_REF(network)
+@@ -389,7 +400,11 @@ CMD(clone, "clone", "", CMD_REF(network)
info, true, true, false);
- if (app.opts.signing_key() == "")
+ if (!keys.have_signing_key())
+#if defined(RSE) /* cosmetics-netsync */
+ P(F("doing anonymous pull"));
+#else
@@ -332,8 +332,8 @@
change_current_working_dir(start_dir);
===================================================================
Index: cmd_ws_commit.cc
---- cmd_ws_commit.cc 1ccfaf790bb0726d0c797c230a6c85d67070d7ae
-+++ cmd_ws_commit.cc 890cf8d4c4d49e6b48eb1eb9662d2852c19ac3c6
+--- cmd_ws_commit.cc c80c17bafef3305b0cfe4cc522835e38278cf443
++++ cmd_ws_commit.cc 49a3e645f1fe4566321e8156eb1b3177f71702f4
@@ -73,7 +73,14 @@ revision_summary(revision_t const & rev,
for (set<file_path>::const_iterator i = cs.dirs_added.begin();
@@ -712,8 +712,8 @@
// fill-column: 76
===================================================================
Index: std_hooks.lua
---- std_hooks.lua d8c06cff3368b388f6b6268227e1432a94a3ed6f
-+++ std_hooks.lua 9cb4968109871df229d5cd5a1ef4fdbf0e04e1a9
+--- std_hooks.lua eff8bcbd98c0643e183c5a1ee043a2af914129ac
++++ std_hooks.lua 2d0196520ddca56c6cbd943060665e74900e3153
@@ -304,6 +304,15 @@ function edit_comment(basetext, user_log
if user_log_message == "" or string.sub(user_log_message, -1) ~= "\n"
then
tmp:write("\n")
@@ -730,7 +730,7 @@
tmp:write(basetext)
io.close(tmp)
-@@ -1373,3 +1382,213 @@ end
+@@ -1375,3 +1384,213 @@ end
return push_hook_functions(notifier)
end
end
@@ -979,8 +979,8 @@
UNIT_TEST_CHECK(bookkeeping_path(bp.as_internal(),
===================================================================
Index: work.cc
---- work.cc 766cbbfd5b78c442ed6fc650846daa55f9d42768
-+++ work.cc 9b78be9d1d0494559e41ce859453089515f3d07f
+--- work.cc c51fba22fdcce8d71385eb0aded4c4df512eb640
++++ work.cc 39ce8f6d62e86aa3309b60095dc0a3540d3eb697
@@ -58,35 +58,55 @@ get_revision_path(bookkeeping_path & m_p
static void
get_revision_path(bookkeeping_path & m_path)
@@ -1115,8 +1115,8 @@
}
static inline bookkeeping_path
-@@ -1760,9 +1810,15 @@ workspace::perform_pivot_root(database &
- E(is_dir_t(new_roster.get_node(new_root)), origin::user,
+@@ -1761,9 +1811,15 @@ workspace::perform_pivot_root(database &
+ E(is_dir_t(old_roster.get_node(new_root)), origin::user,
F("proposed new root directory '%s' is not a directory") % new_root);
{
+#if defined(RSE) /* alt-book-keeping-root */
@@ -1124,7 +1124,7 @@
+ F("proposed new root directory '%s' contains illegal path %s or %s")
+ % new_root % bookkeeping_root % alt_bookkeeping_root);
+#else
- E(!new_roster.has_node(new_root / bookkeeping_root_component),
origin::user,
+ E(!old_roster.has_node(new_root / bookkeeping_root_component),
origin::user,
F("proposed new root directory '%s' contains illegal path %s")
% new_root % bookkeeping_root);
+#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/monotone/monotone.spec
============================================================================
$ cvs diff -u -r1.44 -r1.45 monotone.spec
--- openpkg-src/monotone/monotone.spec 18 Apr 2009 13:12:56 -0000
1.44
+++ openpkg-src/monotone/monotone.spec 13 May 2009 10:29:35 -0000
1.45
@@ -31,8 +31,8 @@
Class: EVAL
Group: SCM
License: GPL
-Version: 0.43
-Release: 20090410
+Version: 0.44
+Release: 20090513
# package options
%option with_rse yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
