I think these are acceptable test failures. dpkg-mergechangelog is a bit more liberal in what it accepts as a changelog entry which is why test_not_valid_changelog fails
test_unsorted fails because dpkg-mergechangelog no longer fixes up the order of entries in the changelog. I think that is reasonable - it's doing a merge, not fixing the formatting of the changelog file (we don't expect a merge of two C files to clean up the indentation too). Of course, it should add new entries at the right place in the changelog, but it appears to be doing that. test_3way_conflicted is correct and does the right thing by merging the two changelog entries rather than conflicting. this is bug 517093 I think this also fixes a fair number of other bugs open against bzr- builddeb. In particular: bug 517090, bug 552950 -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/718944 Title: bzr-builddeb merge sorts the changelog by version order, rather than preserving existing ordering To manage notifications about this bug go to: https://bugs.launchpad.net/bzr-builddeb/+bug/718944/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
