SVN切換分支從舊版本到新版本

舊版本 https://svn.alibaba-inc.com/repos/ali_express/mobile/modules/mobile/adaptor/branches/20140421_358481_2

新版本 https://svn.alibaba-inc.com/repos/ali_express/mobile/modules/mobile/adaptor/branches/20140428_358481_3

一、查看舊版本改動

svn log --stop-on-copy https://svn.alibaba-inc.com/repos/ali_express/mobile/modules/mobile/adaptor/branches/20140421_358481_2

得到708449

二、切換分支到新版本

svn sw https://svn.alibaba-inc.com/repos/ali_express/mobile/modules/mobile/adaptor/branches/20140428_358481_3

三、合並

嚐試合並：svn merge -r709409:head https://svn.alibaba-inc.com/repos/ali_express/mobile/modules/mobile/adaptor/branches/20140422_360285_1 --dry-run

svn merge -r708449:head https://svn.alibaba-inc.com/repos/ali_express/mobile/modules/mobile/adaptor/branches/20140428_358481_2

(往曆史版本合並！)

四、如果沒有衝突，直接提交

svn ci -m "superdeals test"

解決樹衝突：

1.刪除原項目

rm -rf

2.拉新的分支

svn co https://svn.alibaba-inc.com/repos/ali_express/seller/apps/web/intl-wsbops/branches/20140512_358481_5 intl-wsbops

3.往舊版本合

svn merge -r708936:head https://svn.alibaba-inc.com/repos/ali_express/seller/apps/web/intl-wsbops/branches/20140422_358481_superdeals_4

4.提交

svn ci -m "superdeals test"

解決衝突

svn resolve --accept working web/wsstore/.settings

最後更新：2017-04-03 12:56:25