Per-file merge hook for bzr

[Michael Bienia]

On 2010-01-14 11:20:00 +1100, Andrew Bennetts wrote:
> Judging from <https://bugs.edge.launchpad.net/bzr/+bug/491711>, the next step
> for udd is to implement a hook to merge debian/changelog in bzr-builddeb.  Is
> there some code already written for merging or at least parsing debian/changelog
> files?

"from debian_bundle import changelog" (package is python-debian)

It contains a class for parsing debian/changelog and also a class for
versions (including policy-compliant comparison as it uses python-apt
for it).

You might perhaps also want to look at the code for MoM (Merge-o-Matic;
https://code.edge.launchpad.net/~ubuntu-core-dev/merge-o-matic/trunk) to
see how it prepared its merges (including debian/changelog).

Michael