lp:~robert-ancell/bzr-builddeb/bug-498078

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:bzr-builddeb

James Westby: Approve on 2009-12-18

Diff: 13 lines (+1/-1)

1 file modified

import_dsc.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #498078: Crash running merge-upstream for the first time

High

Fix Released

Link a bug report

Related blueprints

391. By Robert Ancell on 2009-12-18

Fix crash running bzr merge-upstream

390. By James Westby on 2009-12-09

Ensure that the merged upstream revisions end up in the target branch.

During merge-upstream we may commit a new revision in a temporary branch.
If you do this outside a shared repo then the new revision has ghost parents
in the target branch, which leads to many issues, e.g. bug 493462.

389. By James Westby on 2009-12-08

Compare the upstream versions as Versions in merge-package.

Comparing them as strings means that the wrong one is picked as the
newer in merge-package where they diverge. This leads to mis-merges.

388. By James Westby on 2009-12-01

Recommend python-launchpadlib.

387. By James Westby on 2009-12-01

Handle no-trees repo in merge-upstream, and subprocess_setup in more places.

386. By James Westby on 2009-12-01

Clean up some unused imports.

385. By James Westby on 2009-12-01

Use bzrlib.trace.note instead of the deprecated b.t.info. Thanks Jelmer.

384. By James Westby on 2009-11-23

Fix issues with lucid being unknown.

Add "lucid" to util.py so that it is known when needed.

Remove the distribution handling code in mark-uploaded, as it isn't used
anyway.

383. By James Westby on 2009-11-03

Fix a couple more type errors in upstream version handling.

382. By James Westby on 2009-10-07

Use the correct .changes filename when the version has an epoch.