創建新分支

svn cp -m "名稱" +空格+項目的svn地址 +空格+拷貝後的地址


svn cp -m "報價新分支" https://[email protected]/svn/Bihuwalking/iosApp/BHGlaucus https://xxx@xxx/svn/Bihuwalking/iosApp/BHGlaucus_1

項目編譯執行後發現了一個問題，我之前主幹上的代碼並不是最新的，怎麽辦呢？

先到主幹的工作目錄下，將代碼全部提交，

然後怎麽更新到分支呢？難道要重新創建分支嗎？不是，可以從主幹合並到分支

從主幹合並到分支

切換到分支目錄下：

cd BHGlaucuss_1

執行;

svn merge https://[email protected]/svn/Bihuwalking/iosApp/Glaucus

沖突合並提示：

Summary of conflicts:
 Text conflicts: 1
Conflict discovered in file ‘Glaucus/Managers/BHDataConfig.h‘.
Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
       (mc) my side of conflict, (tc) their side of conflict,
       (s) show all options: tc
Resolved conflicted state of 
 
‘Glaucus/Managers/BHDataConfig.h‘
Summary of conflicts:
 Text conflicts: 0 remaining (and 1 already resolved)

選擇了 tc.

合並分支到主幹

和從主幹到分支一樣簡單

進入主幹的工作目錄 執行命令

svn merge --reintegrate https://[email protected]/svn/Bihuwalking/iosApp/BHGlaucus_1

Cornerstone 拉分支 命令版