Hi Andrew,
You are right. The documentation branch is not as likely to accumulate
new features as the code trunk is. The documentation merge was pretty
straightforward. I rely on your judgement that this will be less
onerous. Let's do as you propose and just commit doc changes to the
trunk next week. I'll do a mega merge before generating the next candidate.
Regards,
-Rick
Andrew McIntyre wrote:
On 8/18/06, Rick Hillegas <[EMAIL PROTECTED]> wrote:
I have merged documentation changes from the trunk into the 10.2 branch
down through subversion revision 432716. From now on, documentation
changes will need to be committed to both the trunk and to the 10.2
branch.
Is that because you're not planning on doing another mega-merge?
Because, especially for the docs, it seems like a far easier thing to
do than committing each patch twice. There aren't likely to be any doc
changes going into the trunk that aren't appropriate for 10.2 before
the release.
andrew
