lp:~jelmer/bzr-builddeb/709602-fix-duplicate-versions

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:bzr-builddeb at revision 503

James Westby: Approve on 2011-01-31

Diff: 24 lines (+4/-1)

1 file modified

cmds.py (+4/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #709602: merge-upstream adds duplicate entries when in merge mode

Medium

Fix Released

Link a bug report

Related blueprints

503. By Jelmer Vernooij on 2011-01-30

'bzr merge-upstream' now errors out if the upstream version has already been merged.

Previously it would happily update the changelog with newer versions when the
branch was being used in 'merge' mode.

502. By Jelmer Vernooij on 2011-01-29

Merge support for preserving epochs.

501. By Jelmer Vernooij on 2011-01-29

Quick fix for merge-upstream command logic.

I'll work on more tests for this code.

500. By Jelmer Vernooij on 2011-01-29

Merge support for using 'bzr merge-upstream' in merge mode.

499. By Jelmer Vernooij on 2011-01-29

Merge fix to allow version argument to be optional.

498. By Jelmer Vernooij on 2011-01-28

Merge change of get_latest_version to return latest version string rather than fetching tarball.

497. By Jelmer Vernooij on 2011-01-28

Merge rename of get_specific_version to fetch_tall and returning of tarball path.

496. By Jelmer Vernooij on 2011-01-28

Merge refactoring of get_export_upstream_revision to take an upstream version string rather than a Version object.

495. By Jelmer Vernooij on 2011-01-28

Merge support for building package where previous upload was to a non-release pocket.

494. By Jelmer Vernooij on 2011-01-17

Prefer updating upstream version string using a forma tthat's already being used.