[Bug 511785] [NEW] Apparently simple control file merge failure

[Scott Kitterman]

Public bug reported:

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.

** Affects: bzr-builddeb (Ubuntu)
     Importance: Undecided
         Status: New

-- 
Apparently simple control file merge failure
https://bugs.launchpad.net/bugs/511785
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.

-- 
ubuntu-bugs mailing list
ubuntu-bugs at lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs