Wednesday, April 3, 2013

Creating and Updating a trunk from the branch with svn

  1. do svn copy svn+ssh://host.example.com/repos/project/trunk -m “Creating branch”
  2. While in you own branch, svn info to make sure
  3. Do svn add, svn commit -m “ rev nr ” and svn up
  4. svn merge -c 402 file:///host.example.com/repos/project/trunk –dry-run, and then without the last part (you could have merge conflicts that you need to sort out firstly)
  5. svn commit -m “merged rev 402 from trunk into branch“
  6. svn switch file:///host.example.com/repos/project/trunk (svn switch to trunk)
  7. svn merge -c 402 file:///opt/svn/banks-shop.co.za/branches/NAME_OF_BRANCH/ –dry-run and then without
  8. svn commit -m “merged branches/ rev 402 to trunk”
  9. remember to use svn up for the branch and the trunk after the commit is done
  10. 402 is used as a possible example

No comments:

Post a Comment