This is what I have found that works for merging a trunk to a branch:
It seems that with svn version pre 1.4, you must specify the version where your branch was last copied or merged from. If your branch was created at version 234, then the following command would merge it.
svn merge --dry-run \
svn+ssh://svn.example.com/export/myproject/branches/newbranchh@234 \
svn+ssh://svn.example.com/export/myproject/trunk/@HEAD .
http://www.svnforum.org/threads/38394-1.4-merge
No comments:
Post a Comment