lp:~jelmer/bzr-builddeb/merge-package-revision

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:bzr-builddeb at revision 642

James Westby: Approve on 2011-11-10

Diff: 247 lines (+58/-44)

5 files modified

cmds.py (+13/-7)
debian/changelog (+2/-1)
import_dsc.py (+7/-7)
merge_package.py (+21/-20)
tests/test_merge_package.py (+15/-9)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #888590: --revision argument for merge-package

Low

Fix Released

Link a bug report

Related blueprints

645. By Jelmer Vernooij on 2011-11-10

Fix tests.

644. By Jelmer Vernooij on 2011-11-10

Support --revision argument to merge-package. LP: #888590

643. By Jelmer Vernooij on 2011-11-10

Add missing space in error message.

642. By Jelmer Vernooij on 2011-11-08

Cope with multiple upstream tarballs in can_pull_upstream_from_branch.

641. By Jelmer Vernooij on 2011-11-08

merge support for multiple upstream tarballs in PristineTarSource.has_version.

640. By Jelmer Vernooij on 2011-11-03

Merge lp:~jameinel/bzr-builddeb/no_revision_history: remove uses of Branch.revision_history(), which is deprecated in newer versions of bzr.

639. By James Westby on 2011-10-28

Use python-distro-info to get list of all Debian and Ubuntu releases.

638. By Vincent Ladeuil on 2011-10-25

Fix the returned values when dpkg-mergechangelogs is not available.

Also, small tweaks to the DistributionBranch.__init__ doc string found eons ago.

637. By Jelmer Vernooij on 2011-10-24

Merge support for importing upstream sources with non-ascii names (Martin [gz])

636. By Jelmer Vernooij on 2011-10-22

Merge tweak for deprecation warning from Martin [gz]