3-way changelog file merge doesn't do textual merging on sections
Bug #517093 reported by
John A Meinel
This bug affects 2 people
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Ubuntu Distributed Development |
Fix Released
|
Medium
|
Andrew Bennetts | ||
| bzr-builddeb |
Fix Released
|
High
|
Andrew Bennetts | ||
Bug Description
When the fix for bug #516060 lands, it has some limitations.
One is that it if THIS and OTHER both modify the same block (Version) it doesn't try to merge the content as a standard text merge. (we could use bzrlib.
Related branches
lp:~spiv/bzr-builddeb/use-dpkg-mergechangelogs
- 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: | |
| importance: | Undecided → Low |
| status: | New → Confirmed |
Revision history for this message
| Jelmer Vernooij (jelmer) wrote | #1 |
| Changed in bzr-builddeb: | |
| importance: | Low → High |
| Changed in udd: | |
| status: | New → Triaged |
| importance: | Undecided → Medium |
| Changed in bzr-builddeb: | |
| status: | Confirmed → Triaged |
Revision history for this message
| Andrew Bennetts (spiv) wrote | #2 |
| Changed in bzr-builddeb: | |
| assignee: | nobody → Andrew Bennetts (spiv) |
| status: | Triaged → In Progress |
| 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 udd: | |
| status: | Triaged → Fix Released |
| assignee: | nobody → Andrew Bennetts (spiv) |
| Changed in bzr-builddeb: | |
| status: | Fix Committed → Fix Released |
To post a comment you must log in.
This is fairly annoying when working with feature branches, each of which will modify the latest changelog entry.