bzr-builddeb merge sorts the changelog by version order, rather than preserving existing ordering
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Ubuntu Distributed Development |
Fix Released
|
Undecided
|
Andrew Bennetts | ||
bzr-builddeb |
Fix Released
|
High
|
Andrew Bennetts | ||
bzr-builddeb (Ubuntu) |
Fix Released
|
High
|
Andrew Bennetts |
Bug Description
Binary package hint: bzr-builddeb
For a simple merge of two UDD branches that have 3 and 2 new package revisions on them respectively, but a *very* extensive package history that includes multiple renames, bzr merge rips the changelog to shreds:
$ bzr diff debian/
changelog | 4549 +++++++
1 file changed, 2274 insertions(+), 2275 deletions(-)
$
Every time I do a UDD merge between branches I have to pay close attention to how the changelog has been modified; but in the case of gcc-4.5, it's an absolute nightmare.
I think bzr-builddeb (or python-debian) needs to be switched to using the dpkg-mergechangelog implementation, instead of this divergent implementation that insists on reordering all the entries in the changelog in version order instead of respecting the existing shared history.
Related branches
- Jelmer Vernooij: Approve (code)
-
Diff: 438 lines (+167/-161)4 files modifiedREADME (+5/-0)
debian/changelog (+10/-1)
merge_changelog.py (+60/-116)
tests/test_merge_changelog.py (+92/-44)
Changed in bzr-builddeb (Ubuntu): | |
importance: | Undecided → High |
status: | New → Confirmed |
Changed in bzr-builddeb: | |
status: | New → Triaged |
importance: | Undecided → High |
tags: | added: changelog-merge |
Changed in bzr-builddeb: | |
status: | In Progress → Fix Committed |
milestone: | none → 2.7.6 |
Changed in bzr-builddeb: | |
milestone: | 2.7.6 → 2.7.7 |
Changed in bzr-builddeb (Ubuntu): | |
assignee: | nobody → Andrew Bennetts (spiv) |
Changed in udd: | |
status: | New → Fix Released |
Changed in bzr-builddeb: | |
status: | Fix Committed → Fix Released |
Changed in udd: | |
assignee: | nobody → Andrew Bennetts (spiv) |
I thought it was a debian requirement that the changelog be in version sorted order...