lp:~jelmer/bzr-builddeb/merge-upstream-branch-revision

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:bzr-builddeb at revision 553

James Westby: Approve on 2011-04-28

Diff: 180 lines (+68/-11)

7 files modified

cmds.py (+10/-2)
debian/changelog (+7/-0)
merge_upstream.py (+2/-2)
tests/blackbox/test_merge_upstream.py (+19/-3)
tests/test_upstream.py (+18/-0)
upstream/__init__.py (+2/-0)
upstream/branch.py (+10/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #772424: ignores upstream branch if version can't be found

High

Fix Released

Link a bug report

Related blueprints

554. By Jelmer Vernooij on 2011-04-28

Add another test.

553. By Jelmer Vernooij on 2011-04-28

In 'bzr merge-usptream', don't ignore upstream branch when upstream
version can not be found. LP: #772424

552. By Jelmer Vernooij on 2011-04-19

releasing version 2.7.3

551. By Jelmer Vernooij on 2011-04-18

Do not error if the top changelog entry is not a recognized Debian or
Ubuntu upload target.

550. By Jelmer Vernooij on 2011-04-18

Fix merge of bz2 upstream tarballs. LP: #737012

549. By Jelmer Vernooij on 2011-03-31

Merge support for using lazy hooks if available.

548. By Jelmer Vernooij on 2011-03-30

Merge --launchpad option to 'bzr merge-upstream'.

547. By Jelmer Vernooij on 2011-03-28

Merge support for lazy opening upstream branch.

546. By James Westby on 2011-03-22

Only look for the previous upload if --package-merge is specified.

545. By Jelmer Vernooij on 2011-03-14

releasing version 2.7.2