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

[Jelmer Vernooij]

On Mon, 2011-03-14 at 11:58 +0100, John Arbash Meinel wrote:
> ...
> 
> >> 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
> 
> I thought I actually addressed this one, but maybe I'm remembering
> incorrectly.
No, that one is definitely still there (and probably the most annoying
one of the three).

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/532d68cc/attachment.pgp>