1. Check and review diffs
#svn diff http://192.168.0.5:9010/svn/xxx/Trunk/00SourceCode http://192.168.0.5:9010/svn/xxx/Branch/YYYY
2. Check Branch revision history
#svn log --verbose --stop-on-copy http://192.168.0.5:9010/svn/xxx/Branch/YYYY
3. Update working copy
#cd <WORK_PATH>
#svn update
4. Apply diffs of Branch
#svn merge -r 8347:HEAD http://Steven.Li@192.168.0.5:9010/svn/xxx/Branch/YYYY
5. Assure
#svn diff
6. Commit these modification
#svn ci -m "Merged YYYY changes r8347:8348 into the trunk"
Reference:
http://svnbook.red-bean.com/en/1.0/ch04s04.html
svn diff and merge
最新推荐文章于 2022-11-02 14:51:34 发布