lp:~gz/bzr-builddeb/merge_changelog_invalid_version_tweak_testing

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:bzr-builddeb at revision 662

Bzr-builddeb-hackers: Pending requested 2011-12-14

Diff: 198 lines (+65/-46)

1 file modified

tests/test_merge_changelog.py (+65/-46)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

670. By Martin Packman on 2011-12-14

Merge trunk to resolve conflict in test_merge_changelog.py

669. By Martin Packman on 2011-12-14

Slightly strengthen log output assertion on error

668. By Martin Packman on 2011-12-14

Add extra test for original kind of invalid version from bug 893495

667. By Martin Packman on 2011-12-14

Rearrange new test to use more of existing framework and work in other locales

666. By Martin Packman on 2011-12-14

Remove duplicated lines from earlier test

665. By Martin Packman on 2011-12-14

Give in to nitpickiness and fix spelling of 'pseudo' in test examples

664. By Martin Packman on 2011-12-14

Fix test docstring noted by jelmer in review

663. By Martin Packman on 2011-12-13

Make non-zero return from dpkg-mergechangelog fall back to other merge handlers

662. By Martin Packman on 2011-12-13

Add failing test for merging a changelog containing a bad verson

661. By Martin Packman on 2011-12-13

Fix handling of encoding with logging in merge_changelogs and tests