merge-upstream requires patches to be uncommitted

Bug #815854 reported by Jonathan Riddell
16
This bug affects 2 people
Affects Status Importance Assigned to Milestone
bzr-builddeb
Fix Released
High
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)
Changed in bzr-builddeb:
status: New → Triaged
importance: Undecided → High
Revision history for this message
Jeremy Bícha (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.

Revision history for this message
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)
Changed in bzr-builddeb:
status: Triaged → In Progress
assignee: nobody → Jelmer Vernooij (jelmer)
Jelmer Vernooij (jelmer)
Changed in bzr-builddeb:
status: In Progress → Fix Committed
milestone: none → 2.8.1
Jelmer Vernooij (jelmer)
Changed in bzr-builddeb:
status: Fix Committed → Fix Released
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.