有关merge的小知识
Merge a branch back into the trunk (assuming that you have a working copy of the trunk, and that the branch was created in revision 250):$ svn merge -r 250:HEAD http://svn.red-bean.com/repos/branches/my-branch
Umyproj/tiny.txt
Umyproj/thhgttg.txt
Umyproj/win.txt
Umyproj/flo.txt
If you branched at revision 23, and you want to merge changes on trunk into your branch, you could do this from inside the working copy of your branch:
$ svn merge -r 23:30 file:///tmp/repos/trunk/vendors
Umyproj/thhgttg.txt
…
To merge changes to a single file:
$ cd myproj
$ svn merge -r 30:31 thhgttg.txt
Uthhgttg.txt mark，以前merge老是出错。
SVN的merge功能好强的。
页:
[1]