利用者:Kazanbas/svn tips
svn tips
This document can be useful for GSoC students and coders who'd like to refresh their memory on topics beyond svn basics.
Getting info
What rev is my current working copy?
svn info
Since BASE is the keyword for working copy rev, this is equivalent:
svn info -r BASE
What rev is the repository?
svn info [rep_URL]
Merging with 2.5
Thanks to Jaguarandi for helping me to figure this out. Merging without specifying revisions is evil... Merge should be done like so:
svn merge -r [last_merge]:[current_rev] [2.5_URL]
replace [...] with your own values. If it's your first merge, then last_merge is the rev when your branch was created. Use svn log to find that. current_rev you can find with svn info [2.5_URL]. Be sure to note down current_rev, you'll use it on next merge as the value of last_merge.
Also, if you're merging from the top blender directory in your working copy, then you should append blender to 2.5_URL, i.e. https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
Undoing a commit
A commit can be undone with svn merge, e.g. the following, along with a subsequent svn commit, will rollback to oldrev:
svn merge -r [newrev]:[oldrev] [branch_URL]
or, if oldrev is just before newrev:
svn merge -c [newrev] [branch_URL]
URLs
- Blender 2.5: https://svn.blender.org/svnroot/bf-blender/branches/blender2.5
- my branch: https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-kazanbas/
