Evan Prodromou wrote:
It's a common version-control practise to make a stable branch before a release, and do only bug fixes, stabilizing changes, and release-related mods (version number, release notes, etc.) in that branch. Then, after the release milestone and hoopla, at your leisure you merge all changes back into HEAD as one big packet.
In my experience, merging anything as one big packet is a big pain in the butt. :) Better to merge the changes up into HEAD when they're still fresh in your mind.
-- brion vibber (brion @ pobox.com)