bzr: ERROR: An error (1) occurred running quilt: Patch <name> does not remove cleanly (refresh it or enforce with -f)

Bug #928666 reported by David Henningsson
16
This bug affects 3 people
Affects Status Importance Assigned to Milestone
brz-debian
Triaged
Medium
Unassigned
bzr-builddeb
Triaged
Medium
Unassigned
bzr-builddeb (Ubuntu)
Triaged
Medium
Unassigned

Bug Description

When I try to merge or pull from lp:~cjcurran/gnome-control-center/expose-card-ports/
I get the following error:

$ bzr merge
Merging from remembered parent location bzr+ssh://bazaar.launchpad.net/~cjcurran/gnome-control-center/expose-card-ports/
Unapplying quilt patches to prevent spurious conflicts
bzr: ERROR: An error (1) occurred running quilt: Patch 92_git_minimal_output_height.patch does not remove cleanly (refresh it or enforce with -f)

I asked Jelmer if this was a user error, but he told me to file a bug for it.

ProblemType: Bug
DistroRelease: Ubuntu 12.04
Package: bzr 2.5.0~beta5-3ubuntu1
ProcVersionSignature: Ubuntu 3.2.0-14.23-generic 3.2.3
Uname: Linux 3.2.0-14-generic x86_64
ApportVersion: 1.91-0ubuntu1
Architecture: amd64
Date: Wed Feb 8 08:36:47 2012
EcryptfsInUse: Yes
InstallationMedia: Ubuntu 12.04 LTS "Precise Pangolin" - Alpha amd64 (20120103)
PackageArchitecture: all
SourcePackage: bzr
UpgradeStatus: No upgrade log present (probably fresh install)

Revision history for this message
David Henningsson (diwic) wrote :
Jelmer Vernooij (jelmer)
Changed in bzr (Ubuntu):
status: New → Triaged
importance: Undecided → Medium
assignee: nobody → Jelmer Vernooij (jelmer)
Jelmer Vernooij (jelmer)
affects: bzr (Ubuntu) → bzr-builddeb (Ubuntu)
Jelmer Vernooij (jelmer)
Changed in bzr-builddeb:
status: New → Triaged
importance: Undecided → Medium
Changed in bzr-builddeb (Ubuntu):
assignee: Jelmer Vernooij (jelmer) → nobody
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Perhaps this should be a warning rather than an error. I.e. we can just continue with the merge without the quilt patch handling.

Changed in brz-debian:
status: New → Triaged
importance: Undecided → Medium
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.