lp:~lifeless/bzr-builddeb/trunk

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:bzr-builddeb at revision 463

Bzr-builddeb-hackers: Pending requested 2010-07-04

Diff: 268 lines (+183/-27)

4 files modified

bzrtools_import.py (+32/-21)
debian/changelog (+7/-0)
dh_make.py (+10/-1)
tests/blackbox/test_merge_upstream.py (+134/-5)

api

Merged into lp:~bzr-builddeb-hackers/bzr-builddeb/trunk-old

James Westby: Approve on 2009-12-01

Diff: 473 lines (+64/-53)

7 files modified

builder.py (+5/-5)
changes.py (+1/-1)
cmds.py (+19/-19)
directory.py (+5/-5)
hooks.py (+2/-2)
import_dsc.py (+16/-5)
upstream.py (+16/-16)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #486534: merge-upstream doesn't work in shared treeless repo	High	Fix Released
Bug #496907: .bzrignore files stripped	Wishlist	Fix Released
Bug #507270: merge-upstream tarball results in ERROR: [Errno 2] No such file or directory	Critical	Fix Released
Bug #588060: unversioned executability issue, perhaps in builddeb	High	Fix Released

Link a bug report

Related blueprints

463. By Robert Collins on 2010-07-06

Happy path tests R us. bzrtools_import file id resolution fix tested.

462. By Robert Collins on 2010-07-04

(No tests yet) treat the upstream branch as authoritative for file ids -
causes renamed to be honoured. (LP: #588060)

461. By James Westby on 2010-07-02

Improvements to merge-upstream help. Thanks Martin.

460. By James Westby on 2010-06-30

Merge fixes from I.

459. By Jelmer Vernooij on 2010-05-31

Add missing entry, bug number to changelog.

458. By James Westby on 2010-05-28

Support -r in import-upstream.

457. By James Westby on 2010-05-28

Remove some unused imports.

456. By James Westby on 2010-05-28

Avoid deprecation warnings when using newer versions of apt.

455. By James Westby on 2010-05-28

Fix logic error when --revision is specified.

454. By James Westby on 2010-05-28

Inline get_upstream_sources.