Merge lp://staging/~gz/bzr-builddeb/merge_changelog_invalid_version_tweak_testing into lp://staging/bzr-builddeb
Proposed by
Martin Packman
| Status: | Merged |
|---|---|
| Merged at revision: | 662 |
| Proposed branch: | lp://staging/~gz/bzr-builddeb/merge_changelog_invalid_version_tweak_testing |
| Merge into: | lp://staging/bzr-builddeb |
| Diff against target: |
198 lines (+65/-46) 1 file modified
tests/test_merge_changelog.py (+65/-46) |
| To merge this branch: | bzr merge lp://staging/~gz/bzr-builddeb/merge_changelog_invalid_version_tweak_testing |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Bzr-builddeb-hackers | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2011-12-14.
Description of the change
Follow up to previous mp, tidying up the merge_changelog testing a little:
<https:/
Original way of spelling the test meant it would fail when selftest was run with LANG=de_DE.UTF-8 for example. Have rearranged things a bit to make it easy to add another test for the original style of invalid version as well.
(Resubmitting for clean diff after resolving conflict)
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Hi,
Thanks for cleaning this up. It looks good to me, assuming the
conflicts are easily resolvable.
Thanks,
James