bzr-builddeb

Merge lp://staging/~jelmer/bzr-builddeb/quilt-hooks into lp://staging/bzr-builddeb

quilt-hooks
Merge into trunk

Proposed by Jelmer Vernooij on 2012-01-02

Status:

Merged

Merged at revision:

685

Proposed branch:

lp://staging/~jelmer/bzr-builddeb/quilt-hooks

Merge into:

lp://staging/bzr-builddeb

Prerequisite:

lp://staging/~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://staging/~jelmer/bzr-builddeb/quilt-hooks

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
James Westby		2012-01-02	Approve on 2012-01-04
Review via email: mp+87290@code.staging.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.

lp://staging/~jelmer/bzr-builddeb/quilt-hooks updated on 2012-01-02

680. By Jelmer Vernooij on 2012-01-02: Automatically unapply patches before merge operations.
LP: #815854

Revision history for this message

James Westby (james-w) wrote on 2012-01-04:

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

Revision history for this message

James Westby (james-w) on 2012-01-04:

review: Approve

Revision history for this message

Jelmer Vernooij (jelmer) wrote on 2012-01-05:

> Woop, thanks a lot for this one!
>
> 10 + if getattr(merger, "_no_quilt_unapplying", False):
>
> Is that to avoid recursion?
Yep. I found out the hard way :)

> This looks good. I'm interested to know how well it works :-)
Thanks, me too.