无来

不管你来还是不来
我都在这里,夜夜点亮
不是为了守候
只是为了做好我自己

0%

svn merge 合并单个文件

I’m not sure exactly what you’re asking as the title talks about merging single files but the text of the question talks about single revisions. In the case of merging single revisions you need: (to merge the changes committed in revisions 100, 105, 115)

1
2
cd trunk
svn merge -c 100 -c 105 -c 115 http://..../branches/mybranch .

If you want to merge only the part of revision 100 that affects file.cpp:

1
2
cd trunk/path/to/file.cpp
svn merge -c 100 http://../branches/mybranch/path/to/file.cpp file.cpp