Proposal: Add bzr-changelog-merge to 'core' plugins distributed with bzrlib
John Arbash Meinel
john at arbash-meinel.com
Mon Mar 14 10:58:34 UTC 2011
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
...
>> 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.
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAk199NoACgkQJdeBCYSNAAOjrwCfTGoH1N6TRHR+mF8JwuWIoufh
QjEAoM80JouDG2QPyvn3VjNN9gmSEhCL
=HaU4
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list