lp://staging/~jelmer/bzr-builddeb/doctest-fixes

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/bzr-builddeb at revision 466

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

Diff: 24 lines (+5/-5)

1 file modified

changes.py (+5/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

466. By Jelmer Vernooij on 2010-07-31

Fix some doctest failures (with newer versions of python-debian?)

465. By James Westby on 2010-07-30

Try importing from debian first. Thanks Jelmer.

464. By James Westby on 2010-07-29

Fixed a logic error that stops -r working in merge-upstream.

463. By James Westby on 2010-07-29

Fix errors on import of renamed files.

When a file was renamed we would erroneously assign the file id to two paths.
We avoid that by ensuring we take the one from the upstream branch if there is
one. Thanks Rob.

462. By KarlGoetz on 2010-07-07

Fix readme rstification from Karl Goetz

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.