You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@forrest.apache.org by David Crossley <cr...@apache.org> on 2005/06/13 09:21:32 UTC

preparation for merging the docs-reorg branch

I did a dry-run ...

cd /svn/asf/docs_reorg_200506_branch-forrest
svn log --verbose --stop-on-copy \
 https://svn.apache.org/repos/asf/forrest/branches/docs_reorg_200506_branch
... reveals that r189951 is the beginning of the branch.

cd /svn/asf/forrest-trunk
svn merge --dry-run -r 189951:HEAD \
 https://svn.apache.org/repos/asf/forrest/branches/docs_reorg_200506_branch .

... as expected there were conflicts reported only in site.xml

Here is the commit message that would be used
svn commit -m "Merged docs_reorg_200506_branch 189951:HEAD into the trunk"

--David