merge-upstream requires patches to be uncommitted

Bug #815854 reported by Jonathan Riddell on 2011-07-25
This bug affects 2 people
Affects Status Importance Assigned to Milestone
Jelmer Vernooij

Bug Description

When running merge-upstream the user must first remove all patches and commit the source without patches. This is not very intuitive. merge-upstream should be intelligent enough to remove patches, commit if needed, to the upstream merge, then try to reapply the patches and give a status of the patches (e.g. "patch 02-foo failed to apply with new upstream").

Related branches

Jelmer Vernooij (jelmer) on 2011-07-26
Changed in bzr-builddeb:
status: New → Triaged
importance: Undecided → High
Jeremy Bicha (jbicha) wrote :

Not sure about trying to reapply the patches since that should maybe still be manual, but the unapplying patches step should be automatic with a console message that the patches have been unapplied.

Barry Warsaw (barry) wrote :

You're absolutely right. Note too that after doing the merge-upstream, if e.g. you have quilt patches, you have to manually (sometimes force) each patch in turn to see if it's still relevant or still applies.

Jelmer Vernooij (jelmer) on 2012-01-02
Changed in bzr-builddeb:
status: Triaged → In Progress
assignee: nobody → Jelmer Vernooij (jelmer)
Jelmer Vernooij (jelmer) on 2012-01-05
Changed in bzr-builddeb:
status: In Progress → Fix Committed
milestone: none → 2.8.1
Jelmer Vernooij (jelmer) on 2012-01-18
Changed in bzr-builddeb:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers