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: 04-Sep-2008 23:35:37
Branch: HEAD Handle: 2008090422353700
Modified files:
openpkg-src/monotone monotone.patch.rse monotone.spec
Removed files:
openpkg-src/monotone monotone.patch
Log:
upgrading package: monotone 0.40 -> 0.41
Summary:
Revision Changes Path
1.20 +0 -208 openpkg-src/monotone/monotone.patch
1.10 +33 -33 openpkg-src/monotone/monotone.patch.rse
1.39 +2 -4 openpkg-src/monotone/monotone.spec
____________________________________________________________________________
rm -f openpkg-src/monotone/monotone.patch <<'@@ .'
Index: openpkg-src/monotone/monotone.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/monotone/monotone.patch.rse
============================================================================
$ cvs diff -u -r1.9 -r1.10 monotone.patch.rse
--- openpkg-src/monotone/monotone.patch.rse 5 Jul 2008 10:12:09 -0000
1.9
+++ openpkg-src/monotone/monotone.patch.rse 4 Sep 2008 21:35:37 -0000
1.10
@@ -301,8 +301,8 @@
if (next > 0)
===================================================================
Index: cmd_netsync.cc
---- cmd_netsync.cc 27ebccae0f902d134ed780bc678b73c954613e43
-+++ cmd_netsync.cc 5034034bbb15b278bb355f80f1f3641fe4fe6261
+--- cmd_netsync.cc 34174bb7ce83722d7a9859b7065c40243ca0ba75
++++ cmd_netsync.cc 9e4cf97f7d4f031cd68999517822f5fc6121fb82
@@ -253,7 +253,11 @@ CMD(pull, "pull", "", CMD_REF(network),
args, info, false);
@@ -315,7 +315,7 @@
run_netsync_protocol(app.opts, app.lua, project, keys,
client_voice, sink_role, info);
-@@ -355,9 +359,16 @@ CMD(clone, "clone", "", CMD_REF(network)
+@@ -356,9 +360,16 @@ CMD(clone, "clone", "", CMD_REF(network)
// paths.cc's idea of the current workspace root is wrong at this point
if (internal_db)
@@ -330,10 +330,10 @@
/ ws_internal_db_file_name);
+#endif
- // must do this after setting dbname so that _MTN/options is written
- // correctly
-@@ -378,7 +389,11 @@ CMD(clone, "clone", "", CMD_REF(network)
- info, true, true);
+ // this is actually stupid, but app.opts.branchname must be set here
+ // otherwise it will not be written into _MTN/options, in case
+@@ -383,7 +394,11 @@ CMD(clone, "clone", "", CMD_REF(network)
+ info, true, true, false);
if (app.opts.signing_key() == "")
+#if defined(RSE) /* cosmetics-netsync */
@@ -386,9 +386,9 @@
CMD_NO_WORKSPACE(migrate_workspace, "migrate_workspace", "", CMD_REF(tree),
===================================================================
Index: diff_patch.cc
---- diff_patch.cc 06f64d5def0166740f243dedf7fd6776662a0978
-+++ diff_patch.cc d88b56756954ba8b7647cb83194f438cdcf8cbc0
-@@ -1442,6 +1442,9 @@ make_diff(string const & filename1,
+--- diff_patch.cc 211424b28fdc3a5dcdae5a781feea97e1e915326
++++ diff_patch.cc 0ebf55f44a911f3e72dc381c1dda3e762103ae7e
+@@ -1449,6 +1449,9 @@ make_diff(string const & filename1,
{
case unified_diff:
{
@@ -398,7 +398,7 @@
ost << "--- " << filename1 << '\t'
<< id1 << '\n';
ost << "+++ " << filename2 << '\t'
-@@ -1453,6 +1456,9 @@ make_diff(string const & filename1,
+@@ -1460,6 +1463,9 @@ make_diff(string const & filename1,
}
case context_diff:
{
@@ -451,9 +451,9 @@
void
===================================================================
Index: lua_hooks.cc
---- lua_hooks.cc a747d898e036539c69beba100f6a67e1491b6f96
-+++ lua_hooks.cc 8e1fccf93d8658ff25a41f0a3c28e8689af7d86a
-@@ -208,7 +208,11 @@ lua_hooks::load_rcfiles(options & opts)
+--- lua_hooks.cc e93b511c04660956edd432fda230877ca3c6fc2b
++++ lua_hooks.cc 0286c7452a45384187df02ccf6e33ee311828372
+@@ -209,7 +209,11 @@ lua_hooks::load_rcfiles(options & opts)
{
load_rcfile(opts.conf_dir / "monotonerc", false);
}
@@ -467,8 +467,8 @@
// Command-line rcfiles override even that.
===================================================================
Index: options_list.hh
---- options_list.hh 78fbe7c5728513ee672b75d6dcefbc2f508ba915
-+++ options_list.hh 55158b5e69d2fe75c58e51697a50724597910c47
+--- options_list.hh cd0ff5a0d051b4644c02a5f81ed262a512c65360
++++ options_list.hh 25e39a62d57d8c82427a8deae709826cc2bff4a3
@@ -233,6 +233,24 @@ OPTION(diff_options, no_show_encloser, f
no_show_encloser = true;
}
@@ -496,9 +496,9 @@
#ifdef option_bodies
===================================================================
Index: paths.cc
---- paths.cc d850c3efae62041b8003589817387e5877f63b01
-+++ paths.cc 7bb66816f0cc3ee8e13527d0ee3b1fc0a1d56411
-@@ -226,7 +226,11 @@ in_bookkeeping_dir(string const & path)
+--- paths.cc dde6659e387c8890c96278ea29e3196bdf588139
++++ paths.cc 3101fad7134c9f2383bee0b65219cdec1d46f2e4
+@@ -227,7 +227,11 @@ in_bookkeeping_dir(string const & path)
static inline bool
in_bookkeeping_dir(string const & path)
{
@@ -510,7 +510,7 @@
return false;
if (path.size() == 1 || (path[1] != 'M' && path[1] != 'm'))
return false;
-@@ -919,6 +923,9 @@ find_and_go_to_workspace(string const &
+@@ -929,6 +933,9 @@ find_and_go_to_workspace(string const &
// first look for the current name of the bookkeeping directory.
// if we don't find it, look for it under the old name, so that
// migration has a chance to work.
@@ -520,7 +520,7 @@
if (!find_bookdir(root, bookkeeping_root_component, current, removed))
if (!find_bookdir(root, old_bookkeeping_root_component, current,
removed))
return false;
-@@ -1478,7 +1485,11 @@ static void check_bk_normalizes_to(char
+@@ -1488,7 +1495,11 @@ static void check_bk_normalizes_to(char
static void check_bk_normalizes_to(char const * before, char const * after)
{
@@ -554,9 +554,9 @@
{
===================================================================
Index: roster_merge.cc
---- roster_merge.cc b2fca269f9de878a4c50a48f2f437cc385db52a7
-+++ roster_merge.cc 71b58f073db3e56731b1a969bdbd95983926806d
-@@ -1296,6 +1296,20 @@ roster_merge(roster_t const & left_paren
+--- roster_merge.cc 9bb39c2c87f92180b0a5db5697ff6ea15b82d25b
++++ roster_merge.cc 9b75d448ee88458f86092ee8d7f4720b24d211a9
+@@ -1854,6 +1854,20 @@ roster_merge(roster_t const & left_paren
result.roster.detach_node(n->self);
result.invalid_name_conflicts.push_back(conflict);
}
@@ -577,7 +577,7 @@
}
}
-@@ -2228,7 +2242,12 @@ struct simple_invalid_name_conflict : pu
+@@ -2786,7 +2800,12 @@ struct simple_invalid_name_conflict : pu
I(!result.is_clean());
invalid_name_conflict const & c = idx(result.invalid_name_conflicts,
0);
I(c.nid == bad_dir_nid);
@@ -592,8 +592,8 @@
result.invalid_name_conflicts.pop_back();
===================================================================
Index: std_hooks.lua
---- std_hooks.lua 9fd3160c435eff59acc8622875047304e3472b9c
-+++ std_hooks.lua ad10b3627e6bdb4124ee553843ee9552ea41fb87
+--- std_hooks.lua 7e22137903335a8b7dd2ce7bc9969b8962ff85be
++++ std_hooks.lua 751f8ca2cb91b2ecca05caef00466bd020ce3ca8
@@ -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")
@@ -610,7 +610,7 @@
tmp:write(basetext)
io.close(tmp)
-@@ -1257,3 +1266,201 @@ end
+@@ -1273,3 +1282,201 @@ end
return push_hook_functions(notifier)
end
end
@@ -814,8 +814,8 @@
+
===================================================================
Index: work.cc
---- work.cc 9c9fd46396607ec971ccf77b6dbdfe54934b9ec5
-+++ work.cc 504af8561f70be210430114d21fcee74e87a34df
+--- work.cc 0ef66673796d2a408587d70530944a5a8747d488
++++ work.cc 8cfa90878704a6fc1553c4dc14bf1be428831674
@@ -57,35 +57,55 @@ get_revision_path(bookkeeping_path & m_p
static void
get_revision_path(bookkeeping_path & m_path)
@@ -926,7 +926,7 @@
read_options_file(o_path,
database_option, branch_option, key_option,
keydir_option);
}
-@@ -557,7 +599,11 @@ workspace::get_local_dump_path(bookkeepi
+@@ -563,7 +605,11 @@ workspace::get_local_dump_path(bookkeepi
{
N(workspace::found, F("workspace required but not found"));
@@ -938,7 +938,7 @@
L(FL("local dump path is %s") % d_path);
}
-@@ -929,7 +975,11 @@ path_for_detached_nids()
+@@ -976,7 +1022,11 @@ path_for_detached_nids()
static inline bookkeeping_path
path_for_detached_nids()
{
@@ -950,7 +950,7 @@
}
static inline bookkeeping_path
-@@ -1668,9 +1718,15 @@ workspace::perform_pivot_root(database &
+@@ -1715,9 +1765,15 @@ workspace::perform_pivot_root(database &
N(is_dir_t(new_roster.get_node(new_root)),
F("proposed new root directory '%s' is not a directory") % new_root);
{
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/monotone/monotone.spec
============================================================================
$ cvs diff -u -r1.38 -r1.39 monotone.spec
--- openpkg-src/monotone/monotone.spec 5 Jul 2008 10:12:09 -0000
1.38
+++ openpkg-src/monotone/monotone.spec 4 Sep 2008 21:35:37 -0000
1.39
@@ -31,8 +31,8 @@
Class: EVAL
Group: SCM
License: GPL
-Version: 0.40
-Release: 20080705
+Version: 0.41
+Release: 20080904
# package options
%option with_rse yes
@@ -44,7 +44,6 @@
Source4: monotone-colorize.pl
Source5: monotone-colorize.bashrc
Source6: monotone.bashrc
-Patch0: monotone.patch
Patch1: monotone.patch.rse
# build information
@@ -77,7 +76,6 @@
%prep
%setup -q
- %patch -p0 -P 0
%if "%{with_rse}" == "yes"
%patch -p0 -P 1
%endif
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
