Author: adam-guest
Date: 2008-03-04 06:47:34 +0000 (Tue, 04 Mar 2008)
New Revision: 1098
Modified:
trunk/debian/changelog
trunk/scripts/debcommit.pl
Log:
debcommit: Don't attempt to call svk diff with options, as it doesn't
support them (Closes: #469238)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-03-03 22:44:18 UTC (rev 1097)
+++ trunk/debian/changelog 2008-03-04 06:47:34 UTC (rev 1098)
@@ -17,6 +17,8 @@
+ Modify each of the simple shell variable tests (e.g. $RANDOM) to
also match ${variable}
* bts: Allow the sendmail command to begin with a ~ (Closes: #469207)
+ * debcommit: Don't attempt to call svk diff with options, as it doesn't
+ support them (Closes: #469238)
-- Adam D. Barratt <[EMAIL PROTECTED]> Sat, 01 Mar 2008 11:42:02 +0000
Modified: trunk/scripts/debcommit.pl
===================================================================
--- trunk/scripts/debcommit.pl 2008-03-03 22:44:18 UTC (rev 1097)
+++ trunk/scripts/debcommit.pl 2008-03-04 06:47:34 UTC (rev 1098)
@@ -523,8 +523,11 @@
} else {
@diffcmd = ('git', 'diff', '-w', '--cached', '--no-color');
}
- } elsif ($prog eq 'svn' || $prog eq 'svk') {
+ } elsif ($prog eq 'svn') {
@diffcmd = ($prog, 'diff', '--diff-cmd', '/usr/bin/diff',
'--extensions', '-wu');
+ } elsif ($prog eq 'svk') {
+ @diffcmd = ($prog, 'diff');
+ }
} else {
@diffcmd = ($prog, 'diff', '-w');
}
--
To unsubscribe, send mail to [EMAIL PROTECTED]
