On 15 March 2011 22:44, Loïc Minier <loic.min...@linaro.org> wrote: >> > 7) merge to trunk (with the inevitable ChangeLog merge failure >> > that you mentioned). > > bzr has plugins to merge changelog entries for some types of > changelogs; I wonder whether we could use these here. Another option > would be to generate a GNU ChangeLog from the bzr log at release time > as we do for linaro-image-tools for instance.
spiv just put up a proposal[1] to ship the changelog-merging code in bzr core. If that doesn't handle gcc's particular ChangeLog form, please file a bug against bzr with an example and tagged linaro. [1] https://code.launchpad.net/~spiv/bzr/add-changelog-merge/+merge/53380 -- Martin _______________________________________________ linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev
