블로그 이미지
kalstein

여러가지 프로그래밍 관련이나...신변잡기적인 글들을 남기는 블로그입니다. 지식은 나누는만큼 강력해집니다 ^^

Rss feed Tistory
Programming 2009. 4. 22. 09:47

TortoiseSVN 에서 Merge 하기.

지금까지 쭉 써오면서...주로 혼자만 쓰다보니;;; merge기능은 잘 안썼었다.
(branch를 쓰긴했지만, 그냥 테스트용도로 잠시 쓰고 버렸을뿐;;)
이번에 쓰려고 하니 잘 모르는부분이 많아서 검색 후 좋은 내용을 발견.

그래서 링크걸어둔다.

http://bchavez.bitarmory.com/archive/2008/06/03/quothow-toquot-svn-merge-with-tortoisesvn.aspx
Programming 2009. 4. 8. 09:26

Subversion Rollback 하기.

commit을 잘못했을 경우에 대처법. (tortoise SVN)

Subversion doesn’t offer this capability directly, but you can achieve the same results using the merge command. So if you accidently check in some code that you want to then effectively remove from the tree, you can.

svn merge usage has three forms (run svn help merge for the full details) but the one I prefer looks like this:

svn merge -r<from>:<to> <repository> <working directory>

In the wild that translates to something like this (from within your checked-out trunk):

svn merge -r1455:1454 https://prime/svn/client/tfg/aurora2/trunk .

Follow this up with a check in:

svn ci -m "Rolled back to r1454"

Note that it doesn’t remove the broken revision (in the above case, r1455) from the repository. Instead you’ll get a new revision (r1456) which is identical to 1454. It’s still possible though for the broken version to be checked out if you specifies r1455.



요렇게 하면 된다넹~~~
(링크 : http://lambie.org/2008/05/23/rolling-back-your-subversion-repository-to-a-previous-good-revision/)
TOTAL 38,593 TODAY 3