diff options
| author |   Victor Ostorga <vostorga@gentoo.org> | 2009-09-05 00:08:48 +0000 |
|---|---|---|
| committer | Victor Ostorga <vostorga@gentoo.org> | 2009-09-05 00:08:48 +0000 |
| commit | 0065f385ea09f0e9d433c7bb491a05a629ad3431 (patch) | |
| tree | 803de65cb40ef38f7f2bc6a95cc28aeed1c53cec /dev-util/svk | |
| parent | Marking dnsmasq-2.50 ppc64 for bug 280613 (diff) | |
| download | gentoo-2-0065f385ea09f0e9d433c7bb491a05a629ad3431.tar.gz gentoo-2-0065f385ea09f0e9d433c7bb491a05a629ad3431.tar.bz2 gentoo-2-0065f385ea09f0e9d433c7bb491a05a629ad3431.zip | |
Cleaning out unused patch
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'dev-util/svk')
| -rw-r--r-- | dev-util/svk/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/svk/files/svk-1.07-xxdiff.patch | 29 |
2 files changed, 5 insertions, 30 deletions
diff --git a/dev-util/svk/ChangeLog b/dev-util/svk/ChangeLog index f8f4488e00cc..04ec11c12d81 100644 --- a/dev-util/svk/ChangeLog +++ b/dev-util/svk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/svk # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/svk/ChangeLog,v 1.38 2009/07/19 17:49:13 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/svk/ChangeLog,v 1.39 2009/09/05 00:08:47 vostorga Exp $ + + 05 Sep 2009; Víctor Ostorga <vostorga@gentoo.org> + -files/svk-1.07-xxdiff.patch: + Cleaning out unused patch 19 Jul 2009; Torsten Veller <tove@gentoo.org> svk-1.08.ebuild, svk-2.0.2.ebuild: diff --git a/dev-util/svk/files/svk-1.07-xxdiff.patch b/dev-util/svk/files/svk-1.07-xxdiff.patch deleted file mode 100644 index 63789dfdecab..000000000000 --- a/dev-util/svk/files/svk-1.07-xxdiff.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 )} - ); - } - |