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: 30-Oct-2007 07:52:01
Branch: HEAD Handle: 2007103006520000
Modified files:
openpkg-src/monotone monotone.patch monotone.spec
Log:
one more upstream bugfix
Summary:
Revision Changes Path
1.11 +12 -0 openpkg-src/monotone/monotone.patch
1.25 +1 -1 openpkg-src/monotone/monotone.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/monotone/monotone.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 monotone.patch
--- openpkg-src/monotone/monotone.patch 26 Oct 2007 13:26:29 -0000
1.10
+++ openpkg-src/monotone/monotone.patch 30 Oct 2007 06:52:00 -0000
1.11
@@ -21,3 +21,15 @@
#include "pcre.h"
#undef pcre
+Index: std_hooks.lua
+--- std_hooks.lua f6f5c8d503faca26fdc2e06a1a9285f8d4b3700f
++++ std_hooks.lua 149fd794ce4f182372cde6b3f12c8877256a58b3
+@@ -765,7 +765,7 @@ function get_preferred_merge3_command (t
+ -- If there wasn't any user-given merger, take the first that's available
+ -- and wanted.
+ for _,mkey in ipairs(default_order) do
+- c = trymerger(mkey) ; if c then return c,nil end
++ c = trymerger(mkey) ; if c then return c,mkey end
+ end
+ end
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/monotone/monotone.spec
============================================================================
$ cvs diff -u -r1.24 -r1.25 monotone.spec
--- openpkg-src/monotone/monotone.spec 29 Oct 2007 17:20:54 -0000
1.24
+++ openpkg-src/monotone/monotone.spec 30 Oct 2007 06:52:00 -0000
1.25
@@ -33,7 +33,7 @@
Group: SCM
License: GPL
Version: 0.37
-Release: 20071029
+Release: 20071030
# package options
%option with_rse yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
