diff options
| author |   Aron Griffis <agriffis@gentoo.org> | 2006-03-04 05:52:00 +0000 |
|---|---|---|
| committer | Aron Griffis <agriffis@gentoo.org> | 2006-03-04 05:52:00 +0000 |
| commit | df687ea6c658707f4012734f8da66782d5a83a91 (patch) | |
| tree | 534290a8192e56c8afbba1b03602c21ed46c46a3 /dev-util/svk/files | |
| parent | Removed libmal package.mask entry as it's no longer needed. (diff) | |
| download | gentoo-2-df687ea6c658707f4012734f8da66782d5a83a91.tar.gz gentoo-2-df687ea6c658707f4012734f8da66782d5a83a91.tar.bz2 gentoo-2-df687ea6c658707f4012734f8da66782d5a83a91.zip | |
Fix svk smerge interaction with xxdiff
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'dev-util/svk/files')
| -rw-r--r-- | dev-util/svk/files/digest-svk-1.07-r1 | 3 | ||||
| -rw-r--r-- | dev-util/svk/files/svk-1.07-xxdiff.patch | 29 |
2 files changed, 32 insertions, 0 deletions
diff --git a/dev-util/svk/files/digest-svk-1.07-r1 b/dev-util/svk/files/digest-svk-1.07-r1 new file mode 100644 index 000000000000..7062bc78c880 --- /dev/null +++ b/dev-util/svk/files/digest-svk-1.07-r1 @@ -0,0 +1,3 @@ +MD5 d559ab3e4cd14ebfcb2a13e3218b80f2 SVK-1.07.tar.gz 264640 +RMD160 9ae31a522465ff755a1cb3f83bf80d971beea05c SVK-1.07.tar.gz 264640 +SHA256 e0292003417010f8d52ec0c074c2fb7d218dc42654c2aacc5883434995b2663f SVK-1.07.tar.gz 264640 diff --git a/dev-util/svk/files/svk-1.07-xxdiff.patch b/dev-util/svk/files/svk-1.07-xxdiff.patch new file mode 100644 index 000000000000..63789dfdecab --- /dev/null +++ b/dev-util/svk/files/svk-1.07-xxdiff.patch @@ -0,0 +1,29 @@ +Date: Sat, 4 Mar 2006 00:40:28 -0500 +From: Aron Griffis <agriffis gentoo org> +To: svk-dev lists openfoundry org +Subject: patch for SVK/Resolve/XXDiff.pm +Message-ID: <20060304054028.GA3958@olive.flatmonk> + +The following patch fixes svk smerge with xxdiff. Here is the +problem, from xxdiff --help: + + --exit-with-merge-status, -X If all diff hunks are selected and no + unsaved selections exist, then exit + with code of 0. Normally, xxdiff will + pass back the diff return code. + +Since diff returns an exit code of 1 when there are differences, svk +believes that the merge always fails. + +--- SVK-1.07/lib/SVK/Resolve/XXDiff.pm.old 2005-03-28 20:46:18.000000000 -0500 ++++ SVK-1.07/lib/SVK/Resolve/XXDiff.pm 2006-03-04 00:39:53.000000000 -0500 +@@ -5,7 +5,7 @@ + sub arguments { + my $self = shift; + return ( +- qw( -m -O -M ), ++ qw( -X -m -O -M ), + @{$self}{qw( merged yours base theirs )} + ); + } + |