lp:~jelmer/bzr-builddeb/manual-merge-advice

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:bzr-builddeb at revision 606

Jonathan Riddell: Approve on 2011-08-11

Diff: 32 lines (+11/-3)

2 files modified

cmds.py (+4/-3)
debian/changelog (+7/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #783882: Recovery from having manually merged upstream's trunk for a snapshot release is too hard

Medium

Fix Released

Link a bug report

Related blueprints

606. By Jelmer Vernooij on 2011-08-11

Improve error message when tag for upstream version can not be
found. LP: #783882

605. By Jelmer Vernooij on 2011-07-26

releasing version 2.7.7

604. By Jelmer Vernooij on 2011-07-26

Fix compatibility with python < 2.7, where re.sub() does not take a flags argument.

603. By Jelmer Vernooij on 2011-07-26

Recommend libalgorithm-merge-perl, required for conflict resolution
in dpkg-mergechangelogs.

602. By Jelmer Vernooij on 2011-07-26

Fix compatibility with bzr < 2.5.

601. By Jelmer Vernooij on 2011-07-26

Add python-lzma to dependencies.

600. By Jelmer Vernooij on 2011-07-26

releasing version 2.7.7

599. By Jelmer Vernooij on 2011-07-25

Cope with features moving to bzrlib.tests.features.

598. By Jelmer Vernooij on 2011-07-25

Fix formatting of changelog.

597. By Jelmer Vernooij on 2011-07-25

Merge extra tests for tree_contains_upstream_source and fix to not look at unversioned files.