3-way changelog file merge doesn't support deletions
Bug #517090 reported by
John A Meinel
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| bzr-builddeb |
Fix Released
|
Medium
|
Andrew Bennetts | ||
Bug Description
If the fix for bug #516060 lands, then it has a couple limitations.
First, if THIS or OTHER deletes a block (version) vs BASE, we re-introduce it. (We could do a 3-way comparison on the block versions to determine deleted entries, but we'll also have to watch out for THIS deletes and OTHER modifies, etc.)
Related branches
lp://staging/~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)
Revision history for this message
| John A Meinel (jameinel) wrote | #1 |
| Changed in bzr-builddeb: | |
| importance: | Undecided → Low |
| status: | New → Confirmed |
| Changed in bzr-builddeb: | |
| importance: | Low → 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 |
| Changed in bzr-builddeb: | |
| milestone: | none → 2.7.7 |
| status: | Fix Committed → Fix Released |
To post a comment you must log in.
at this point, it doesn't seem critical to support, but more feedback from people using this will let us know