On Thu, 3 Nov 2011, Andrew MacLeod wrote:
Whats the deal on Changelogs? Do we just put the entire branch changelog at
the top of the current changelog with a comment 'merged from cxx-mem-model'
or something to that effect? It just buggers up the date linearality of
changelogs. Or do I add the ChangeLog.mm files and make a comment in
Changelog to look at ChangeLog.mm? This doesnt seem intrusive enough to
require its own.
It's best for each ChangeLog to contain entries describing the changes
made to trunk (with the names of all the contributors), as if the entirety
of the changes came into being fully formed (and possibly point to
ChangeLog.mm for the branch history as well). The branch logs may be of
use in writing those entries, but if e.g. you added a new function and
then made lots of changes to it on the branch, the main ChangeLogs on
trunk would just record that the function is new on trunk, not the various
changes made to it on the branch - and they wouldn't mention at all a
function that was added and then removed on the branch.