lp:~jelmer/bzr-builddeb/svn-upstream-import

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:bzr-builddeb at revision 494

James Westby: Approve on 2011-01-17

Bzr-builddeb-hackers: Pending (code) requested 2010-08-24

Diff: 106 lines (+36/-18)

2 files modified

merge_upstream.py (+35/-12)
tests/test_merge_upstream.py (+1/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

477. By Jelmer Vernooij on 2010-08-24

fix tests.

476. By Jelmer Vernooij on 2010-08-23

Update ~svn / +svn stanza even if the upstream is an import of a svn branch, not just if it is a native svn branch.

475. By James Westby on 2010-08-20

Refactor cmd_merge_upstream in to smaller chunks.

474. By James Westby on 2010-08-19

Don't strip -n from the version we get in merge-upstream.

Some upstreams have a dash in there, and trying to support both means
supporting both badly. If you are used to doing

  bzr merge-upstream --version <package version>

then it will no longer work for you, use the upstream version instead.

473. By James Westby on 2010-08-19

Add changelog entries for the last couple of fixes.

472. By James Westby on 2010-08-19

Avoid an error on merge-upstream with an unrelated branch. Thanks Andrew.

471. By James Westby on 2010-08-19

Avoid using UpstreamBranchSource if we don't know the upstream branch in merge mode.

470. By James Westby on 2010-08-19

Fix two more causes of debian_bundle deprecation warnings.

469. By James Westby on 2010-08-19

Don't fail if asked to use a .bz2 tarball that is already in the desired location.

468. By Jelmer Vernooij on 2010-08-11

Upload 2.5.