-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
... > Then uses Bryce's merge_changelog script and 'dch -i -m' to handle the > repetitive changelog stuff. > > Ideally, the script would also produce something along the lines of > MoM's REPORT, listing the conflicts and giving instructions on how to > proceed. 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. John =:-> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (Cygwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAktgHL4ACgkQJdeBCYSNAAM6TgCfXRhg6fJmHMyBFhrqf4+jWipf oeQAoLkNvtEzrtFkMGSW2UpB4XigbMmh =UTKn -----END PGP SIGNATURE----- -- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
