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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:bzr-builddeb at revision 685

James Westby: Approve on 2012-01-04

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #815854: merge-upstream requires patches to be uncommitted

High

Fix Released

Link a bug report

Related blueprints

680. By Jelmer Vernooij on 2012-01-02

Automatically unapply patches before merge operations.
LP: #815854

679. By Jelmer Vernooij on 2012-01-02

Fix handling of revision trees.

678. By Jelmer Vernooij on 2012-01-02

Clean up temp dirs.

677. By Jelmer Vernooij on 2012-01-02

Merge hooks.

676. By Jelmer Vernooij on 2012-01-02

Merge quilt branch.

675. By Jelmer Vernooij on 2012-01-02

Merge trunk.

674. By Jelmer Vernooij on 2012-01-02

Fix name.

673. By Jelmer Vernooij on 2011-12-20

add hook

672. By Jelmer Vernooij on 2011-12-20

Add basic quilt wrapper.

671. By Jelmer Vernooij on 2011-12-20

Add base files for quilt handling.