lp:~jelmer/bzr-builddeb/merge-package-as-hook

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:bzr-builddeb at revision 677

James Westby: Approve on 2012-01-02

Diff: 239 lines (+77/-37)

8 files modified

__init__.py (+23/-0)
cmds.py (+13/-0)
debian/NEWS (+8/-1)
debian/changelog (+3/-1)
errors.py (+1/-1)
merge_package.py (+4/-12)
tests/blackbox/test_merge_package.py (+25/-0)
tests/test_merge_package.py (+0/-22)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #486075: merge-package doesn't save merge branch	Medium	Fix Released
Bug #910900: merge-package should be a branch hook	Medium	Fix Released

Link a bug report

Related blueprints

682. By Jelmer Vernooij on 2012-01-02

Mention merge rather than merge-package.

681. By Jelmer Vernooij on 2012-01-02

Document deprecation of 'bzr merge-package.

680. By Jelmer Vernooij on 2012-01-02

Hide merge-package on bzr >= 2.5.

679. By Jelmer Vernooij on 2012-01-02

Provide merge-package functionality as a hook for 'bzr merge'. LP:
#486075, LP: #910900

678. By Jelmer Vernooij on 2012-01-02

Some refactoring.

677. By Jelmer Vernooij on 2012-01-02

Use repository rather than branch.

676. By Jelmer Vernooij on 2012-01-02

Warn about merge-package being deprecated.

675. By Jelmer Vernooij on 2011-12-26

Support parallel running of tests in testr.

674. By Jelmer Vernooij on 2011-12-26

Don't run launchpad-dependent tests when Launchpad is unavailable.

673. By Jelmer Vernooij on 2011-12-26

Limit number of tests run by testr.