merge-upstream requires patches to be uncommitted
Bug #815854 reported by
Jonathan Riddell
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
lp:~jelmer/bzr-builddeb/quilt-hooks
- James Westby: Approve
-
Diff: 198 lines (+119/-8)5 files modified__init__.py (+54/-2)
debian/changelog (+2/-0)
errors.py (+12/-0)
merge_quilt.py (+29/-6)
tests/test_merge_quilt.py (+22/-0)
Changed in bzr-builddeb: | |
status: | New → Triaged |
importance: | Undecided → High |
Changed in bzr-builddeb: | |
status: | Triaged → In Progress |
assignee: | nobody → Jelmer Vernooij (jelmer) |
Changed in bzr-builddeb: | |
status: | In Progress → Fix Committed |
milestone: | none → 2.8.1 |
Changed in bzr-builddeb: | |
status: | Fix Committed → Fix Released |
To post a comment you must log in.
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.