ChangeLog management is a tough problem to solve when you have many
branches of development going on. It's sometimes easier to maintain a
separate ChangeLog.MYBRANCH file until you merge with the trunk.
Alternatively, like Bill mentioned, don't bother with editing the
ChangeLog file while working on the branch, but format your SCM
changelog entries so that you can slurp them out at the time of the
merger and dump them into the ChangeLog.
I use Monotone, whose "log" output doesn't follow chronological order
for its entries, but rather parent-child relationships between
revisions. This makes for some interesting reading, but has a more
accurate representation about when the changes took place relative to
the development lifecycle.
--
Chad Walstrom <chewie@wookimus.net> http://www.wookimus.net/
assert(expired(knowledge)); /* core dump */
_______________________________________________
Nmh-workers mailing list
Nmh-workers@nongnu.org
http://lists.nongnu.org/mailman/listinfo/nmh-workers