bzr-builddeb

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

auto-apply-quilt
Merge into trunk

Proposed by Jelmer Vernooij on 2012-01-05

Status:	Merged
Merged at revision:	684
Proposed branch:	lp://staging/~jelmer/bzr-builddeb/auto-apply-quilt
Merge into:	lp://staging/bzr-builddeb
Prerequisite:	lp://staging/~jelmer/bzr-builddeb/fix-bd-do-build-type-guessing
Diff against target:	640 lines (+409/-52) (has conflicts) 8 files modified builder.py (+19/-4) cmds.py (+100/-39) debian/changelog (+9/-0) merge_quilt.py (+27/-0) quilt.py (+154/-0) tests/test_quilt.py (+90/-0) tests/test_util.py (+5/-5) util.py (+5/-4) Text conflict in cmds.py Text conflict in debian/changelog Text conflict in merge_quilt.py Text conflict in quilt.py Text conflict in tests/test_quilt.py
To merge this branch:	bzr merge lp://staging/~jelmer/bzr-builddeb/auto-apply-quilt
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
James Westby		2012-01-05	Approve on 2012-01-05
Review via email: mp+87555@code.staging.launchpad.net

This proposal supersedes a proposal from 2012-01-02.

Description of the change

Automatically apply patches for 3.0 (quilt) packages in 'bzr bd' or 'bzr bd-do'.

Revision history for this message

James Westby (james-w) wrote on 2012-01-04: Posted in a previous version of this proposal

This looks good.

However, the diff on LP includes a bit much. Is that a bug with
added files + prerequisite branches on Launchpad?

Thanks,

James

review: Approve

Revision history for this message

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

Yeah, I'm not sure what's going wrong here - I do seem to have the right prerequisite registered. Resubmitting now to see if it comes up with anything better...

Revision history for this message

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

Well, that seems to be worse :-)

Your change all make sense from what I can see though.

Thanks,

James

review: Approve