Feedback on merging via bzr

[Michael Bienia]

On 2010-01-27 05:00:15 -0600, John Arbash Meinel wrote:
> I'm looking into working on this bug:
> https://bugs.edge.launchpad.net/bzr/+bug/160521
> 
> Which describes adding a changelog-specific per-file merge for
> bzr-builddeb. (if you have the plugin, and do 'bzr merge' that contains
> a merge of a file that looks like 'changelog', then the custom merge
> algorithm gets invoked for that file.)
> 
> I'm wondering if you have a link towards where this "Bryce's
> merge_changelog script" might exist and how I might get ahold of it as a
> reference.

https://lists.ubuntu.com/archives/ubuntu-distributed-devel/attachments/20100114/6936c7d4/attachment.obj
(it was attached to an other mail on this list:
https://lists.ubuntu.com/archives/ubuntu-distributed-devel/2010-January/000357.html)

As this script does its own version comparison and changelog parsing,
you might also want to look at the "python-debian" package which has a
python module for handling changelogs (parsing) and also a python module
for Debian version strings.

Michael