>From >http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.stayinsync
Keeping branch in sync with trunk: svn merge ^/trunk Merging branch back to trunk: svn merge --reintegrate ^/branches/my-calc-branch - at which point you need to delete the branch and start over if you have more changes related to this feature. I think the problem we've been having is partially following the old school of branching, with specific revisions and no --reintegrate. For those of us using straight svn instead of git-svn, we should probably follow these guidelines; I'm not sure if we need to do anything in particular to the existing svn:mergeinfo properties. I suspect we might need to remove them from trunk, but I'm not sure that it's necessary. -- Will "Coke" Coleda _______________________________________________ http://lists.parrot.org/mailman/listinfo/parrot-dev
