3-way changelog file merge doesn't support deletions

Bug #517090 reported by John A Meinel
6
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

Revision history for this message
John A Meinel (jameinel) wrote :

at this point, it doesn't seem critical to support, but more feedback from people using this will let us know

Changed in bzr-builddeb:
importance: Undecided → Low
status: New → Confirmed
Jelmer Vernooij (jelmer)
Changed in bzr-builddeb:
importance: Low → Medium
Jelmer Vernooij (jelmer)
Changed in bzr-builddeb:
status: Confirmed → Triaged
Revision history for this message
Andrew Bennetts (spiv) wrote :

Should be addressed by switching to dpkg-mergechangelogs for the merge logic

Changed in bzr-builddeb:
assignee: nobody → Andrew Bennetts (spiv)
status: Triaged → In Progress
Jelmer Vernooij (jelmer)
Changed in bzr-builddeb:
status: In Progress → Fix Committed
Jelmer Vernooij (jelmer)
Changed in bzr-builddeb:
milestone: none → 2.7.7
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.