Apparently simple control file merge failure

Bug #511785 reported by Scott Kitterman on 2010-01-24
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
bzr-builddeb (Ubuntu)
Medium
Unassigned

Bug Description

Binary package hint: bzr-builddeb

I'm currently working on merging quantlib from Debian. The initial bzr merge-package lp:debian/squeeze/quantlib produced the usual debian/changelog conflict, but also produced an odd control file conflct. The conflict was the entire file. I separated and diffed the two and it didn't seem that this should have been hard. The control file as produced by bzr merge-package and a diff of the two parts of it are (will be) attached.

Scott Kitterman (kitterman) wrote :
Scott Kitterman (kitterman) wrote :
Scott Kitterman (kitterman) wrote :

Actually I hadn't looked at the changelog. It's similarly duplicated.

summary: - Apparently simpler control file merge failure
+ Apparently simple control file merge failure
Jelmer Vernooij (jelmer) on 2014-07-23
Changed in bzr-builddeb (Ubuntu):
status: New → Triaged
importance: Undecided → Medium
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers