1 |
ulm 10/05/07 18:45:47 |
2 |
|
3 |
Added: svk-1.08-xxdiff.patch |
4 |
Log: |
5 |
Move package from dev-util to dev-vcs, bug 56967. |
6 |
(Portage version: 2.2_rc67/cvs/Linux i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 dev-vcs/svk/files/svk-1.08-xxdiff.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-vcs/svk/files/svk-1.08-xxdiff.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-vcs/svk/files/svk-1.08-xxdiff.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: svk-1.08-xxdiff.patch |
15 |
=================================================================== |
16 |
Date: Sat, 4 Mar 2006 00:40:28 -0500 |
17 |
From: Aron Griffis <agriffis gentoo org> |
18 |
To: svk-dev lists openfoundry org |
19 |
Subject: patch for SVK/Resolve/XXDiff.pm |
20 |
Message-ID: <20060304054028.GA3958@×××××.flatmonk> |
21 |
|
22 |
The following patch fixes svk smerge with xxdiff. Here is the |
23 |
problem, from xxdiff --help: |
24 |
|
25 |
--exit-with-merge-status, -X If all diff hunks are selected and no |
26 |
unsaved selections exist, then exit |
27 |
with code of 0. Normally, xxdiff will |
28 |
pass back the diff return code. |
29 |
|
30 |
Since diff returns an exit code of 1 when there are differences, svk |
31 |
believes that the merge always fails. |
32 |
|
33 |
--- SVK-1.08/lib/SVK/Resolve/XXDiff.pm.old 2005-03-28 20:46:18.000000000 -0500 |
34 |
+++ SVK-1.08/lib/SVK/Resolve/XXDiff.pm 2006-03-04 00:39:53.000000000 -0500 |
35 |
@@ -5,7 +5,7 @@ |
36 |
sub arguments { |
37 |
my $self = shift; |
38 |
return ( |
39 |
- qw( -m -O -M ), |
40 |
+ qw( -X -m -O -M ), |
41 |
@{$self}{qw( merged yours base theirs )} |
42 |
); |
43 |
} |