svn copy http://svn.example.com/repos/calc/trunk \

           http://svn.example.com/repos/calc/branches/my-calc-branch \

      -m "Creating a private branch of /calc/trunk."

$ pwd

/home/user/my-calc-branch

$ svn merge http://svn.example.com/repos/calc/trunk

--- Merging r345 through r356 into '.':

U    button.c

U    integer.c

$ svn commit -m "Merged latest trunk changes to my-calc-branch."//有冲突选post，手动解决后，svn resloved，ci提交

//查找历史版本
$ cd parent-dir

$ svn log -v

…

------------------------------------------------------------------------

r808 | joe | -- :: - (Fri,  Dec ) |  lines

Changed paths:

   D /calc/trunk/real.c

   M /calc/trunk/integer.c

$ svn copy http://svn.example.com/repos/calc/trunk/real.c@807 \

           http://svn.example.com/repos/calc/trunk/ \

      -m "Resurrect real.c from revision 807."

Committed revision .

$ svn update

A    real.c

Updated to revision .

svn up -r 版本号(不带r) 文件名