[Bug 947180] Re: [edit-patch] should not unapply quilt patches

[Launchpad Bug Tracker]

This bug was fixed in the package devscripts - 2.11.6ubuntu1

---------------
devscripts (2.11.6ubuntu1) precise; urgency=low

  * Merge from Debian unstable. Remaining changes:
    - Demote Recommends to Suggests:
      + libcrypt-ssleay-perl: only needed for a corner case (uscan on SSL
        download sites), wasn't installed by default in previous releases
        either, and seems quite dead upstream; universe only.
      + debian-keyring: not useful enough in Ubuntu; universe only.
      + equivs: too much of a hack to install by default; universe only.
      + libsoap-lite-perl: only needed for one less common command ("select")
        for bts, which isn't useful for Ubuntu itself, and pulls in a lot of
        other universe Perl libraries; universe only.
    - scripts/debchange.{pl,1}:
      + Adjust --security template for Ubuntu.
      + Add -U/--upstream flag that forces original "just increment
        the end" behaviour; Ubuntu is upstream for some pieces of software.
      + Add --distributor= and DEBCHANGE_DISTRIBUTOR to override lsb_release
        output.
      + Default to "precise" as distribution.
      + Add "ubuntu1" to version string for new versions, with tweaks for
        special cases.
      + Add -R/--rebuild flag for Ubuntu's no-change rebuilds.
      + Don't use the last distribution in debian/changelog when doing
        "dch -r" on Ubuntu. "Just because it was last uploaded to jaunty
        doesn't mean that's the right thing to do now."
    - Add test/debchange.pl, test/Makefile: debchange test suite.
    - Rename XS-Vcs-* to XS-Debian-Vcs-*.

devscripts (2.11.6) unstable; urgency=low

  [ James McCoy ]
  * mk-build-deps: Fix handling of debian/control files.  (Closes: #665496)
  * uscan: Fix formatting in man page.  Thanks to Samuel Bronson for the
    patch.  (Closes: #665325)
  * debsign: Fix quoting in handling of --debs-dir.
    (Closes: #666048, LP: #966867)

  [ Benjamin Drung ]
  * cowpoke.1, deb-reversion.dbk, dscextract.1: Fix typos "occured",
    "transfered", and "addtional". Thanks to A. Costa for the patches.
    (Closes: #655681)
  * debcommit:
    + Subversion 1.7 has only one .svn folder per working copy.
      Thanks to Simon Olofsson for the patch. (Closes: #645106)
    + Support .hg in parent directories.
      Thanks to Simon Olofsson for the patch. (Closes: #652967)

  [ David Prévot ]
  * Typo and stylish fix for dscextract(1). (Closes: #630423)

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).
 -- Benjamin Drung <bdrung at ubuntu.com>   Fri, 30 Mar 2012 16:38:45 +0200

** Changed in: devscripts (Ubuntu)
       Status: In Progress => Fix Released

-- 
You received this bug notification because you are a member of Ubuntu
Foundations Bugs, which is subscribed to devscripts in Ubuntu.
https://bugs.launchpad.net/bugs/947180

Title:
  [edit-patch] should not unapply quilt patches

Status in “devscripts” package in Ubuntu:
  Fix Released
Status in “devscripts” package in Debian:
  Fix Released

Bug description:
  edit-patch will currently unapply all quilt patches before committing
  changes.  However, when some of those patches are applied to the
  branch already, running edit-patch will unapply those as well,
  resulting in more changes in the commit than the developer is actually
  applying.

  == IRC #ubuntu-devel ==
  09:50 < mhall119> so the question is, when there are applied patches on the branch, 
                    should they be unapplied in a separate revision from the actual 
                    change, or as part of the same revision
  09:50 < dholbach> :)
  09:50 < mhall119> not so much "if" as "when"
  09:50 < cjwatson> absolutely not in a separate revision
  09:50 < mhall119> cjwatson: why?
  09:50 < cjwatson> because each revision should be self-contained
  09:51 < cjwatson> if there are applied patches on the branch, then you should leave 
                    the branch that way
  09:51 < cjwatson> if there are unapplied patches on the branch, then you should 
                    leave the branch that way
  09:51 < mhall119> cjwatson: ok, but edit-patch unapplies all patches
  09:51 < cjwatson> edit-patch shouldn't be changing the branch handling policy
  09:51 < mhall119> so should edit-patch not be used?
  09:51 < cjwatson> surely it should be fixed
  09:53 < mhall119> so that's a bug in edit-patch?  If so, I'll file a bug report
  09:55 < cjwatson> sounds like it; it should try as hard as possible to leave stuff 
                    the way it found it ...

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/devscripts/+bug/947180/+subscriptions