Last active
August 29, 2015 14:06
-
-
Save hykw/2051d82ef2ec76869e03 to your computer and use it in GitHub Desktop.
svnのcopy, merge, switch方法
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
svn copy trunk branches/hogehoge | |
svn commit | |
→ リビジョン12345とする | |
# 〜〜〜 branchで作業、最終リビジョンは22222 | |
# BASEディレクトリにcd(svn mergeはパスを指定しないと作業ディレクトリを対象にしちゃうので) | |
cd ~/svn/hogeSVN | |
# 12345〜22222(≒ HEAD)の修正を trunk にマージ | |
svn merge -r12345:HEAD branches/hogehoge trunk | |
---------------------------- | |
svn co http://example.jp/repos/test/trunk | |
mv trunk/* .; mv trunk/.* .; rmdir trunk | |
svn switch http://exmaple.jp/repos/test/branches/hogehoge | |
→ リビジョン100 | |
# 〜〜〜 色々作業、最終リビジョンは200 | |
svn switch http://example.jp/repos/test/trunk | |
svn merge -r100:HEAD http://exmaple.jp/repos/test/branches/hogehoge | |
svn commit | |
#c.f. | |
#http://cockatiel-cage.hateblo.jp/entry/2012/12/14/122449 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment