diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2010-05-07 18:45:47 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2010-05-07 18:45:47 +0000 |
| commit | 43624634545ce4e0fa989ccd012cf928b6dd233a (patch) | |
| tree | 8afc362c83d96ba4df7a7b58b3f41a0179d6e387 /dev-vcs/svk/files | |
| parent | Bug #318821: Flip the order of udev deps, so that a really new version is pre... (diff) | |
| download | historical-43624634545ce4e0fa989ccd012cf928b6dd233a.tar.gz historical-43624634545ce4e0fa989ccd012cf928b6dd233a.tar.bz2 historical-43624634545ce4e0fa989ccd012cf928b6dd233a.zip | |
Move package from dev-util to dev-vcs, bug 56967.
Package-Manager: portage-2.2_rc67/cvs/Linux i686
Diffstat (limited to 'dev-vcs/svk/files')
| -rw-r--r-- | dev-vcs/svk/files/svk-1.08-xxdiff.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/dev-vcs/svk/files/svk-1.08-xxdiff.patch b/dev-vcs/svk/files/svk-1.08-xxdiff.patch new file mode 100644 index 000000000000..bd49b8b3efa4 --- /dev/null +++ b/dev-vcs/svk/files/svk-1.08-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.08/lib/SVK/Resolve/XXDiff.pm.old 2005-03-28 20:46:18.000000000 -0500 ++++ SVK-1.08/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 )} + ); + } + |