2. hg init – a mercurial tutorial by tortoies hg setting up for a team
•
0 j'aime•1,151 vues
2. Hg Init – a Mercurial tutorial by TortoiesHg - Setting up for a Team 관련글: http://surpreem.com/archives/45
Recommandé
Recommandé
Contenu connexe
Similaire à 2. hg init – a mercurial tutorial by tortoies hg setting up for a team
Similaire à 2. hg init – a mercurial tutorial by tortoies hg setting up for a team (6)
Dernier
Dernier (20)
2. hg init – a mercurial tutorial by tortoies hg setting up for a team
- 1. Hg Init – Mercurial tutorial by TortoiseHg Setting up for a Team
- 2. Setting up for a Team % cmd:hg initCentralRepo 내용과 맞추기 위해 해제했으나 기본으로 선택한다. CentralRepo 폴더
- 3. Setting up for a Team Joel’s recipes % cmd:hg clone CentralRepoJoel_recipes Joel’s recipes 폴더
- 4. Setting up for a Team Joel’s recipes % cmd:hg add / hg commit Add, commit Joel’s recipes 폴더
- 5. Setting up for a Team Joel’s recipes % cmd:hg status View File Status 차이점
- 6. Setting up for a Team Joel’s recipes % cmd:hg diff guac file diff tool
- 7. Setting up for a Team Joel’s recipes % cmd:hg com –m “Change crunch to smoosh” Commit % cmd:hg log Workbench
- 8. Setting up for a Team Joel’s recipes CentralRepo Joel’s recipes
- 9. Setting up for a Team Joel’s recipes % cmd:hg push 1. Joel’s recipes 3. 2. 변경 내용을 보낼 주소 선택
- 10. Setting up for a Team Joel’s recipes CentralRepo Joel’s recipes
- 11. Setting up for a Team Rose’s recipes % cmd:hg clone CentralRepoRose_recipes Rose’s recipes 폴더
- 12. Setting up for a Team Rose’s recipes % cmd:hg diff View File Status Beyond Compare 3 Pro Visual Diff
- 13. Setting up for a Team Rose’s recipes % cmd:hg com –m “spicier kind of chile” Commit % cmd:hg log
- 14. Setting up for a Team Joel’s recipes % cmd:hg com –m “potato chips. No one can eat just one.” Commit % cmd:hg log
- 15. Setting up for a Team Joel’s Repository Central Repository Rose’s Repository
- 16. Setting up for a Team Rose’s recipes % cmd:hg outgoing / hg push 1.outgoing 보낼 변경 내용 2.push 변경 내용을 보낼 주소 선택
- 17. Setting up for a Team Joel’s Repository Central Repository Rose’s Repository
- 18. Setting up for a Team Joel’s recipes % cmd:hg outgoing / hg push 1.outgoing 보낼 변경 내용 2.push 변경 내용을 보낼 주소 선택
- 19. Setting up for a Team Joel’s recipes Failure!
- 20. Setting up for a Team Joel’s recipes Detailed log Failure!
- 21. Setting up for a Team Joel’s recipes % cmd:hg incoming / hg pull 1.incoming 가져올 변경 내용 2.pull 변경 내용을 가져올 주소 선택
- 22. Setting up for a Team Joel’s Repository Central Repository Rose’s Repository
- 23. Setting up for a Team Joel’s recipes % cmd: type guac Joel’s guac
- 24. Setting up for a Team Joel’s recipes % cmd:hg cat –r 3 guac Rose’s guac
- 25. Setting up for a Team Joel’s recipes % cmd:hg merge 병합 기준으로 삼을 리비전으로 갱신 (현재 작업 영역은 rev2) 병합할 리비전 선택
- 26. Setting up for a Team Joel’s recipes 2.resolve 1.merge
- 27. Setting up for a Team Joel’s recipes Mercurial Resolve : mercurial에서 병합 처리 Tool Resolve : 툴로 병합 처리 Take Local : Local 변경 내용 사용 Take Other : Other 변경 내용 사용 Mark as Resolved : 충돌 해결한 것으로 표시 Resolve 대기 파일 병합/비교에 사용할 툴 지정 default & Tool Resolve 하면 Mercurial에서 병합 처리
- 28. Setting up for a Team Joel’s recipes Edit File : 파일 편집 3-Way Diff : base, local, other 비교 확인 Diff to Local : Local 변경 내용과 비교 확인 Diff to Other : Other 변경 내용과 비교 확인 Mark as Unresolved : 충돌 해결안 된 것으로 표시 Resolve 완료 파일 완료
- 29. Setting up for a Team Joel’s recipes % cmd:hg commit –m “merge” 작업 영역 상태 커밋메시지
- 30. Setting up for a Team Joel’s recipes % cmd:hg out / hg push 1.outgoing 보낼 변경 내용 2.push 변경 내용을 보낼 주소 선택
- 31. Setting up for a Team Joel’s Repository Central Repository Rose’s Repository
- 32. Setting up for a Team Rose’s recipes % cmd:hg pull 1.pull % cmd:type guac 현재 작업 리비전 % cmd:hg log % cmd:hg parent
- 33. Setting up for a Team Rose’s recipes % cmd:hg up
- 34. Setting up for a Team Rose’s recipes % cmd:type guac