[Bug 501754] [NEW] Better support for merging debian/changelog

[Michael Bienia]

Public bug reported:

Binary package hint: bzr-builddeb

I'm getting slowly used to do merges with "bzr merge-package". In the
few successful merges I did till now with "bzr merge-package" I got a
conflict in debian/changelog as bzr couldn't properly merge the ubuntu
and debian changelog. It seems to always be the top most ubuntu
changelog entries (since the last sync/merge) which cause the merge
conflict. Older Ubuntu changelog entries (from previous merges) are
merged properly.

Is it possible to add support to correctly merge the changelogs? As I
currently have to do it by hand (move the Ubuntu changelog entries into
the correct position/ordering).

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

** Changed in: bzr-builddeb (Ubuntu)
   Importance: Undecided => Wishlist

-- 
Better support for merging debian/changelog
https://bugs.launchpad.net/bugs/501754
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