Proposal: Add bzr-changelog-merge to 'core' plugins distributed with bzrlib

[Jelmer Vernooij]

On Mon, 2011-03-14 at 09:30 +0000, Max Bowsher wrote:
> On 14/03/11 06:01, John Arbash Meinel wrote:
> > On 3/14/2011 5:45 AM, Andrew Bennetts wrote:
> >> Hi all,
> > 
> >> I'd like to add https://launchpad.net/bzr-changelog-merge to the set of
> >> plugins distributed with bzr itself (in the bzrlib/plugins) directory.
> >> It's plugin broadly similar to news_merge, but designed for GNU-format
> >> Changelog files, which are a fairly common format.  In some ways its
> >> task is much simpler, as Changelog files don't have different sections,
> >> just a series of entries.
> > 
> > As long as it has to be enable to have effect, rather than on by
> > default, I'm happy to merge it.
> 
> On a semi-related note, the deb_changelog merger in bzr-builddeb is
> wonderful when it works, but in certain kinds of merging (e.g. PPA
> backports) it often does not do the right thing. I think we should try
> to come up with a command line interface for enabling/disabling special
> mergers (that is a bit less blunt than --no-plugins !)
I'd rather see that merge mechanism working properly ouit of the box, by
fixing these three bugs:

 * https://bugs.launchpad.net/bzr-builddeb/+bug/517093: 3-way changelog
file merge doesn't do textual merging on sections
 * https://bugs.launchpad.net/bzr-builddeb/+bug/552950: Additional
changelog entries are modified when merging another branch
 * https://bugs.launchpad.net/bzr-builddeb/+bug/517090: 3-way changelog
file merge doesn't support deletions

The usefulness of file-specific mergers is severely impacted if it
becomes necessary to specify manual overrides.

Cheers,

Jelmer


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part
URL: <https://lists.ubuntu.com/archives/bazaar/attachments/20110314/ae6945ce/attachment.pgp>