[edit-patch] should not unapply quilt patches

Status changed to 'Confirmed' because the bug affects multiple users.

Small example:

  bzr branch ubuntu:geany
  cd geany
  edit-patch small-desktop-file-fix
  <edit, document and commit>

Check the diff of the last commit to find a huge diff although you probably just changed 1 or 2 lines.

Barry, Jelmer, Michael: sorry for dragging you into this discussion, but it'd be nice to have your input as well.

Reported upstream: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=662689

Benjamin: can this be rolled into a release? I feel there's a number of new contributors regularly tripping over this.

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 architect...