Package: devscripts
Version: 2.10.26
Severity: important
Tags: patch
User: [EMAIL PROTECTED]
Usertags: origin-ubuntu ubuntu-patch intrepid
The change to use 'bzr diff --using /usr/bin/diff --diff-options -wu'
broke bzr commit message detection.
<[EMAIL PROTECTED] ~/src/ubuntu/base-installer/base-installer>$ debcommit
debcommit: unable to determine commit message using bzr
Try using the -m flag.
<[EMAIL PROTECTED] ~/src/ubuntu/base-installer/base-installer>$ bzr di
debian/changelog
=== modified file 'debian/changelog'
--- debian/changelog 2008-02-19 10:26:56 +0000
+++ debian/changelog 2008-04-30 08:02:17 +0000
@@ -1,3 +1,9 @@
+base-installer (1.86ubuntu3) UNRELEASED; urgency=low
+
+ * Use powerpc64-smp kernel on PS3/Cell (LP: #221647).
+
+ -- Colin Watson <[EMAIL PROTECTED]> Wed, 30 Apr 2008 09:02:03 +0100
+
base-installer (1.86ubuntu2) hardy; urgency=low
[ Colin Watson ]
<[EMAIL PROTECTED] ~/src/ubuntu/base-installer/base-installer>$ bzr diff
--using /usr/bin/diff --diff-options -wu debian/changelog
=== modified file 'debian/changelog'
0a1,6
> base-installer (1.86ubuntu3) UNRELEASED; urgency=low
>
> * Use powerpc64-smp kernel on PS3/Cell (LP: #221647).
>
> -- Colin Watson <[EMAIL PROTECTED]> Wed, 30 Apr 2008 09:02:03 +0100
>
<[EMAIL PROTECTED] ~/src/ubuntu/base-installer/base-installer>$ bzr diff
--diff-options=-wu debian/changelog
=== modified file 'debian/changelog'
--- debian/changelog 2008-02-19 10:26:56 +0000
+++ debian/changelog 2008-04-30 08:02:17 +0000
@@ -1,3 +1,9 @@
+base-installer (1.86ubuntu3) UNRELEASED; urgency=low
+
+ * Use powerpc64-smp kernel on PS3/Cell (LP: #221647).
+
+ -- Colin Watson <[EMAIL PROTECTED]> Wed, 30 Apr 2008 09:02:03 +0100
+
base-installer (1.86ubuntu2) hardy; urgency=low
[ Colin Watson ]
In other words, the --using option specifies the whole command line, and
--diff-options is ignored. The fix is simply to drop --using since bzr
already knows to use an external diff program if you supply
--diff-options.
Patch attached.
Thanks,
--
Colin Watson [EMAIL PROTECTED]
Index: scripts/debcommit.pl
===================================================================
--- scripts/debcommit.pl (revision 1410)
+++ scripts/debcommit.pl (working copy)
@@ -576,7 +576,7 @@
} elsif ($prog eq 'baz') {
@diffcmd = ($prog, 'file-diff');
} elsif ($prog eq 'bzr') {
- @diffcmd = ($prog, 'diff', '--using', '/usr/bin/diff', '--diff-options', '-wu');
+ @diffcmd = ($prog, 'diff', '--diff-options', '-wu');
} elsif ($prog eq 'git') {
if ($all) {
@diffcmd = ('git', 'diff', '-w', '--no-color');
