Merge lp://staging/~juliank/merge-o-matic/skip-patches into lp://staging/merge-o-matic
Proposed by
Julian Andres Klode
| Status: | Merged |
|---|---|
| Merged at revision: | 306 |
| Proposed branch: | lp://staging/~juliank/merge-o-matic/skip-patches |
| Merge into: | lp://staging/merge-o-matic |
| Diff against target: |
12 lines (+1/-1) 1 file modified
momlib.py (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~juliank/merge-o-matic/skip-patches |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Colin Watson (community) | Approve | ||
| Simon Quigley | Approve | ||
| Ubuntu Core Development Team | Pending | ||
|
Review via email:
|
|||
Description of the change
MoM currently creates merges using the patches-applied state. This does not make a lot of sense, as the resulting tree often cannot be used as the patches are partially applied and the quilt stack is empty.
Let's just skip applying patches during unpack to fix this.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
LGTM