Merge lp:~jelmer/bzr-builddeb/quilt-hooks into lp:bzr-builddeb
Proposed by
Jelmer Vernooij
Status: | Merged |
---|---|
Merged at revision: | 685 |
Proposed branch: | lp:~jelmer/bzr-builddeb/quilt-hooks |
Merge into: | lp:bzr-builddeb |
Prerequisite: | lp:~jelmer/bzr-builddeb/quilt |
Diff against target: |
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) |
To merge this branch: | bzr merge lp:~jelmer/bzr-builddeb/quilt-hooks |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Westby | Approve | ||
Review via email: mp+87290@code.launchpad.net |
Description of the change
Add hooks for merge to unapply patches before merging.
This means that if there are conflicting patches that are being merged, only the patch files will end up with conflicts - the working tree is kept clean.
To post a comment you must log in.
Woop, thanks a lot for this one!
10 + if getattr(merger, "_no_quilt_ unapplying" , False):
Is that to avoid recursion?
This looks good. I'm interested to know how well it works :-)
Thanks,
James