Debian Bug report logs - #662689
devscripts: [edit-patch] should not unapply quilt patches

Toggle useless messages

Message #5 received at submit@bugs.debian.org (full text, mbox, reply):

From: Michael Hall <mhall119@ubuntu.com>

To: Debian Bug Tracking System <submit@bugs.debian.org>

Subject: devscripts: [edit-patch] should not unapply quilt patches

Date: Mon, 05 Mar 2012 14:26:04 -0500

[Message part 1 (text/plain, inline)]

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

[0001-edit-patch-fix-quilt-patching.patch (text/x-diff, attachment)]

Message #14 received at 662689-submitter@bugs.debian.org (full text, mbox, reply):

From: Benjamin Drung <bdrung@debian.org>

To: 662689-submitter@bugs.debian.org

Subject: Bug#662689 marked as pending

Date: Fri, 09 Mar 2012 01:20:01 +0000

tag 662689 pending
thanks

Hello,

Bug #662689 reported by you has been fixed in the Git repository. You can
see the changelog below, and you can check the diff of the fix at:

    http://git.debian.org/?p=devscripts/devscripts.git;a=commitdiff;h=9d36749

---
commit 9d3674964e33eeb7e8a7121b831627f6a84f1c38
Author: Benjamin Drung <bdrung@debian.org>
Date:   Fri Mar 9 02:19:37 2012 +0100

    Add a changelog entry for Michael Hall's patches.

diff --git a/debian/changelog b/debian/changelog
index b33d72c..a024a4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,7 +23,14 @@ devscripts (2.11.5) UNRELEASED; urgency=low
   * mk-build-deps: Use the most recent version when multiple package versions
     are available.  (Closes: #633143)
 
- -- Adam D. Barratt <adam@adam-barratt.org.uk>  Wed, 15 Feb 2012 19:40:58 +0000
+  [ Benjamin Drung ]
+  * edit-patch:
+    + Do not unapply quilt patches. Thanks to Michael Hall for
+      the patch. (Closes: #662689, LP: #947180)
+    + Remove trailing .sh when checking if the script is being run as
+      edit-patch or add-patch. Thanks to Michael Hall for the patch.
+
+ -- Benjamin Drung <bdrung@debian.org>  Fri, 09 Mar 2012 02:19:00 +0100
 
 devscripts (2.11.4) unstable; urgency=high
 

Message #19 received at 662689-close@bugs.debian.org (full text, mbox, reply):

From: Benjamin Drung <bdrung@debian.org>

To: 662689-close@bugs.debian.org

Subject: Bug#662689: fixed in devscripts 2.11.5

Date: Sat, 24 Mar 2012 10:47:11 +0000

Source: devscripts
Source-Version: 2.11.5

We believe that the bug you reported is fixed in the latest version of
devscripts, which is due to be installed in the Debian FTP archive:

devscripts_2.11.5.dsc
  to main/d/devscripts/devscripts_2.11.5.dsc
devscripts_2.11.5.tar.gz
  to main/d/devscripts/devscripts_2.11.5.tar.gz
devscripts_2.11.5_amd64.deb
  to main/d/devscripts/devscripts_2.11.5_amd64.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 662689@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Benjamin Drung <bdrung@debian.org> (supplier of updated devscripts package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Sat, 24 Mar 2012 11:26:32 +0100
Source: devscripts
Binary: devscripts
Architecture: source amd64
Version: 2.11.5
Distribution: unstable
Urgency: low
Maintainer: Devscripts Devel Team <pkg-devscripts@teams.debian.net>
Changed-By: Benjamin Drung <bdrung@debian.org>
Description: 
 devscripts - scripts to make the life of a Debian Package maintainer easier
Closes: 633143 649227 655854 655932 660782 660788 661337 662689
Changes: 
 devscripts (2.11.5) unstable; urgency=low
 .
   [ Adam D. Barratt ]
   * deb-reversion:
     + Re-fix handling of multi-word hooks.  (Closes: #660782).
       This was originally fixed in 2.9.14 but accidentally broken again in
       2.9.26.
     + Correctly handle cases where a changelog file was not found, possibly
       because of the use of symlinks.  (Closes: #660788)
 .
   [ Jakub Wilk ]
   * deb-reversion: Simplify option parsing, also allowing simpler quoting of
     arguments.
 .
   [ James McCoy ]
   * dd-list: Fix correlation of given package name when it does not match the
     source package name.  (Closes: #655854)
   * dcmd: Escape directory name so it doesn't interfere with sed command.
     (Closes: #649227)
   * debsnap: Check whether architectures have been specified.  (Closes:
     #655932)
   * pts-subscribe: Correct URL to Developer's Reference.  (Closes: #661337)
   * mk-build-deps: Use the most recent version when multiple package versions
     are available.  (Closes: #633143)
 .
   [ Benjamin Drung ]
   * edit-patch:
     + Do not unapply quilt patches. Thanks to Michael Hall for
       the patch. (Closes: #662689, LP: #947180)
     + Remove trailing .sh when checking if the script is being run as edit-patch
       or add-patch. Thanks to Michael Hall for the patch. (LP: #953857)
   * Bump Standard-Version to 3.9.3 (no changes needed).
Checksums-Sha1: 
 83ae62dc27ba35086a2f3ea8325de3c5bebd8acf 2266 devscripts_2.11.5.dsc
 cfcf7668294ad91c125cc8d856b83b0c0d1f7229 772073 devscripts_2.11.5.tar.gz
 55fedca7af9d94fb1f2c2a9f0193009827d4c657 702344 devscripts_2.11.5_amd64.deb
Checksums-Sha256: 
 94a372090d03df25e58b037a24416e7f6f7f3db9620d5d6ca84fb3c362a369d9 2266 devscripts_2.11.5.dsc
 55f77b321a16dc617f59d8c35403e979975544631e31ac8590708e74119363ab 772073 devscripts_2.11.5.tar.gz
 d8af63cde5f1028c00009e8f4aa8a9bb6363180b9c07cb540c588f26eb005239 702344 devscripts_2.11.5_amd64.deb
Files: 
 4bf8f942bfb17d59b36956a3cda8025c 2266 devel optional devscripts_2.11.5.dsc
 615e129b19c641807e30e7e9de2e7003 772073 devel optional devscripts_2.11.5.tar.gz
 1a6673b6f610764f23b5d8ab1a08c784 702344 devel optional devscripts_2.11.5_amd64.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCgAGBQJPbaKvAAoJEBWetcTvyHdMw6cQAKw++7Oxug3lyBfAl6TGAX2D
7W8OlEqLDf1qzl5gQmQQPfMa8d6dOh/hiHl216ZAMy25MhIU+Irx1Jtyhd+47WB5
VKwmc/90Vbwwl3PBrBJq6g4utjjSPhhmHG0f74BnvAUHAyORrxqR15NS7W/AdIPM
1oYJ28+vPy7+L1L4IsPOsMJhV3ZP0NtUu9ZgbzOLb2OpRsdeWBajJ9BxxjldVNYT
C0f9NgMKBjSABCOQNz2lG0lYPkbJL3UKuHar5c+Ldqld4zG0ZaCHcISx0Hejeu5I
SzJm3xG3LWdhFluGLT4p9c7IHkFsahE24Jj4+o0ElDVIhpL3la8Z/mdnQ4WvcWRx
YnIVQZbUZCzGZlb70C4ly0/uuKhqfC4PJXaYnU/jx4sqjPOmb4/dunCG/lGwBpGl
UyDb/leChIRKVbT3p4rZhprMu1QvgVUjMKK6WTybwPaYg01Bew15qRupUSvNqXYp
bm9lxBmenSIGpNRJFds6EwjXsGOT6tp7G0sUmAeudPAJwMX8yz4PdHPjkpzdSklh
//L2lqb3W7JHyIdrps4oBK7goZhF1fXrFLKeVpfCGDVdB9UmEPIBCOxBiTimyzZJ
jz3ssSPa8Me92eU6AQlxWEupVuayPZbT6N4VkvYe8z3Or8Qj5YoAgD0ZJ63V+JJW
SKTfVsxDajk58jprT5Do
=rcc4
-----END PGP SIGNATURE-----

Send a report that this bug log contains spam.