Better support for merging debian/changelog

[Michael Bienia]

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).

[Andrew Bennetts (spiv)]

Related: <https://bugs.edge.launchpad.net/bzr/+bug/491711>, "hook to permit per file merges".

[Andrew Bennetts (spiv)]

Oh, and <https://lists.ubuntu.com/archives/ubuntu-distributed-devel/2010-January/000357.html> (and the rest of that thread) has some code for parsing and merging debian/changelog files, which is probably a good starting point to use with bug 491711's fix.

[Launchpad Janitor (janitor)]

This bug was fixed in the package bzr-builddeb - 2.3

---------------
bzr-builddeb (2.3) experimental; urgency=low

  [ James Westby ]
  * Some support for v3 source formats (Closes: #562991)
    - Those that look quite a lot like v1 are supported well.
    - .tar.bz2 tarballs are supported for import, building, merge-upstream,
      etc., but only enabled for the latter with a --v3 switch for now.
    - Multiple orig.tar.gz is not supported.
    - .tar.lzma is not supported awaiting pristine-tar support.
  * New "dh-make" command ("dh_make" alias) that allows you to start
    packaging, either in an empty branch, or based on an upstream branch.
  * Fix merge-package for native packages (LP: #476348)
  * debian/changelog merge hook to reduce the manual conflict resolution
    required there. Thanks to John Arbash Meinel and Andrew Bennetts
    (LP: #501754).
    - Requires newer bzr.
  * Fix merge-package outside a shared repo (LP: #493462)
  * Fix exporting of symlinks (LP: #364671)
  * Add --force option to merge-upstream which may help certain people.
  * Use system configobj if the bzr copy isn't available. Thanks Jelmer.
  * Make merging multiple-root branches work. Thanks Robert Collins.
  * Disentangle from bzrtools. Thanks Max Bowser.

  [ Jelmer Vernooij ]
  * Bump standards version to 3.8.4.
  * Fix formatting in doc-base.
 -- Jelmer Vernooij <email address hidden> Sat, 13 Feb 2010 01:30:21 +0000