Package: devscripts
Version: 2.11.4ubuntu1
Severity: normal
Tags: patch
Dear Maintainer,
When running edit-patch on the package 'geany' in Ubuntu, the resulting diff
was 4745 lines, while my actual change was online 1 line.
Upon further investigation I found that the bzr branch used by Ubuntu already
had it's quilt patches applied. When edit-patch was run, it would "quilt pop
-a", unapplying all of the patches. This resulted in a new revision containing
both my changes, as well as the remove of all the patch changes.
Attached is a patch that will make edit-patch aware of the current state of
applied patches, and have it revert back to that state before commiting,
resulting in the expected diff.
-- Package-specific info:
--- /etc/devscripts.conf ---
--- ~/.devscripts ---
DEBSIGN_KEYID=8981F572
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise')
Architecture: i386 (i686)
Kernel: Linux 3.2.0-17-generic-pae (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages devscripts depends on:
ii dpkg-dev 1.16.1.2ubuntu5
ii libc6 2.15-0ubuntu3
ii perl 5.14.2-6ubuntu1
ii python 2.7.2-9ubuntu2
ii python2.7 2.7.2-13ubuntu5
Versions of packages devscripts recommends:
ii at 3.1.13-1ubuntu1
ii curl 7.22.0-3ubuntu2
ii dctrl-tools 2.18ubuntu1
ii dput 0.9.6.2ubuntu1
ii fakeroot 1.18.2-1
ii gnupg 1.4.11-3ubuntu2
ii libjson-perl 2.53-1
ii libparse-debcontrol-perl 2.005-3
ii liburi-perl 1.59-1
ii libwww-perl 6.03-1
ii lintian 2.5.5
ii man-db 2.6.1-1
ii patch 2.6.1-3
ii patchutils 0.3.2-1.1
ii python-debian 0.1.21ubuntu1
ii python-magic 5.09-2
ii sensible-utils 0.0.6ubuntu2
ii strace 4.5.20-2.3ubuntu1
ii unzip 6.0-4ubuntu1
ii wdiff 0.6.5-1
ii wget 1.13.4-2ubuntu1
ii xz-utils 5.1.1alpha+20110809-3
Versions of packages devscripts suggests:
ii bsd-mailx [mailx] 8.1.2-0.20111106cvs-1
ii build-essential 11.5ubuntu2
ii cvs-buildpackage <none>
ii debian-keyring 2011.12.01
ii devscripts-el <none>
ii equivs <none>
ii gnuplot <none>
ii libauthen-sasl-perl 2.1500-1
ii libcrypt-ssleay-perl 0.57-2ubuntu1
ii libfile-desktopentry-perl 0.04-3
ii libnet-smtp-ssl-perl <none>
ii libsoap-lite-perl <none>
ii libterm-size-perl 0.2-4build5
ii libtimedate-perl 1.2000-1
ii libyaml-syck-perl 1.19-1
ii mutt <none>
ii openssh-client [ssh-client] 1:5.9p1-2ubuntu2
ii svn-buildpackage <none>
ii w3m 0.5.3-5ubuntu1
-- no debconf information
>From 223a609ea6851c56ce3fec8b08b2f509d8bf5bd6 Mon Sep 17 00:00:00 2001
From: Michael Hall <mhall...@gmail.com>
Date: Mon, 5 Mar 2012 14:15:21 -0500
Subject: [PATCH] edit-patch: fix quilt patching
---
scripts/edit-patch.sh | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/scripts/edit-patch.sh b/scripts/edit-patch.sh
index 671c7ba..2843775 100755
--- a/scripts/edit-patch.sh
+++ b/scripts/edit-patch.sh
@@ -121,6 +121,8 @@ edit_patch_dpatch() {
edit_patch_quilt() {
export QUILT_PATCHES=debian/patches
+ top_patch=$(quilt top)
+ echo "Top patch: $top_patch"
if [ -e $PREFIX/$1 ]; then
# if its a existing patch and we are at the end of the stack,
# go back at the beginning
@@ -138,7 +140,8 @@ edit_patch_quilt() {
# use a sub-shell
quilt shell
quilt refresh
- quilt pop -a
+ echo "Reverting quilt back to $top_patch"
+ quilt pop $top_patch
vcs_add $PREFIX/$1 $PREFIX/series
}
--
1.7.9
