cvs 將 branch 合併回 trunk 的做法,(cvs建分支的做法 可參考 "cvs 建分支 branch")
- cvs checkout trunk # 先把 trunk checkout 出來.
- cd trunk # 進入 trunk 的目錄中
先把書上的其它做法記一下, (可參考CVS Branch and Merge example)
- # merge from branch to trunk
- cvs update -j branchbasetag -j branchname
- # merging a branch to the trunk
- cvs update -j lastmergetag -j branchname
- ex: cvs update -j beta_0-1_branck_root -j beta_0-1_branch
- # merge from trunk to branch
- cvs update -j beta_0-1_branch_root -j HEAD
- # merging from branch to branch
- cvs update -j branchbasetag -j otherbranch