Merge lp:~jelmer/bzr-builddeb/quilt-tree-policy into lp:bzr-builddeb
Proposed by
Jelmer Vernooij
Status: | Merged |
---|---|
Approved by: | Jelmer Vernooij |
Approved revision: | 691 |
Merged at revision: | 689 |
Proposed branch: | lp:~jelmer/bzr-builddeb/quilt-tree-policy |
Merge into: | lp:bzr-builddeb |
Diff against target: |
223 lines (+144/-3) 5 files modified
__init__.py (+11/-0) config.py (+3/-0) merge_quilt.py (+43/-1) quilt.py (+28/-2) tests/test_merge_quilt.py (+59/-0) |
To merge this branch: | bzr merge lp:~jelmer/bzr-builddeb/quilt-tree-policy |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Westby | Approve | ||
Review via email: mp+87751@code.launchpad.net |
Description of the change
Add a hook and configuration setting that allows automatically applying patches after merges/pulls.
Together with my other changes, this makes it easy to always have patches
applied in the working tree, but unapplied in revisions (which helps with
merging).
To post a comment you must log in.
What state does this leave things in if the quilt patches don't apply
after the operation?
Thanks,
James