Merge lp:~spiv/bzr-builddeb/use-dpkg-mergechangelogs into lp:bzr-builddeb
Status: | Merged |
---|---|
Approved by: | Jelmer Vernooij |
Approved revision: | 584 |
Merged at revision: | 596 |
Proposed branch: | lp:~spiv/bzr-builddeb/use-dpkg-mergechangelogs |
Merge into: | lp:bzr-builddeb |
Diff against target: |
438 lines (+167/-161) 4 files modified
README (+5/-0) debian/changelog (+10/-1) merge_changelog.py (+60/-116) tests/test_merge_changelog.py (+92/-44) |
To merge this branch: | bzr merge lp:~spiv/bzr-builddeb/use-dpkg-mergechangelogs |
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij | code | Approve | |
Review via email: mp+68797@code.launchpad.net |
Commit message
Use dpkg-mergechang
Description of the change
This switches merge_changelog to simply call out to dpkg-mergechang
As discussed on the bug and UDD list this required updating some tests for the new behaviour, but everyone seems confident that the new behaviour is actually better.
Fixing the tests revealed two very minor drawbacks to dpkg-mergechang
1) when merging invalid changelogs it seems to lose the final line of text
2) the conflict markers aren't quite standard: “<<<<<<” rather than “<<<<<<<” (6 vs. 7 chars).
1) is mitigated greatly by the fact that dpkg-mergechang
2) is largely cosmetic. I can imagine it might impede using external tools to help deal with conflicts (like meld?) but with some luck those tools are tolerant of the difference, and that drawback is greatly outweighed by the benefit of doing better merges in the first place.
I've updated the README to list installing dpkg-dev as a requirement. For the intended audience of bzr-builddeb that seems pretty reasonable :)
I think (1) is an acceptable regression given how many other regressions this mp fixes. We should probably file a bug against dpkg-dev about it.
For (2), would it be possible to do postprocessing on the file to fix up the conflict markers to be more standard? It seems like a minor thing though, so perhaps a bug report would also be nice for this.
Either way, I think this is a huge improvement over the previous situation.
[tweak]
Can you add the right entries for these bugs to debian/changelog? The dch command should make this easy ("dch 'Fix the foobar. LP: #...'").