Hg Init – Mercurial tutorial<br />by TortoiseHg<br />Setting up for a Team<br />
Setting up for a Team<br />% cmd:hg initCentralRepo<br />내용과 맞추기 위해 해제했으나 기본으로 선택한다.<br />CentralRepo 폴더<br />
Setting up for a Team<br />Joel’s recipes<br />% cmd:hg clone CentralRepoJoel_recipes<br />Joel’s recipes 폴더<br />
Setting up for a Team<br />Joel’s recipes<br />% cmd:hg add / hg commit<br />Add, commit<br />Joel’s recipes 폴더<br />
Setting up for a Team<br />Joel’s recipes<br />% cmd:hg status<br />View File Status<br />차이점<br />
Setting up for a Team<br />Joel’s recipes<br />% cmd:hg diff guac<br />file diff tool<br />
Setting up for a Team<br />Joel’s recipes<br />% cmd:hg com –m “Change crunch to smoosh”<br />Commit<br />% cmd:hg log<br ...
Setting up for a Team<br />Joel’s recipes<br />CentralRepo<br />Joel’s recipes<br />
Setting up for a Team<br />Joel’s recipes<br />% cmd:hg push<br />1.<br />Joel’s recipes<br />3.<br />2. 변경 내용을 보낼 주소 선택<b...
Setting up for a Team<br />Joel’s recipes<br />CentralRepo<br />Joel’s recipes<br />
Setting up for a Team<br />Rose’s recipes<br />% cmd:hg clone CentralRepoRose_recipes<br />Rose’s recipes 폴더<br />
Setting up for a Team<br />Rose’s recipes<br />% cmd:hg diff<br />View File Status<br />Beyond Compare 3 Pro<br />Visual D...
Setting up for a Team<br />Rose’s recipes<br />% cmd:hg com –m “spicier kind of chile”<br />Commit<br />% cmd:hg log<br />
Setting up for a Team<br />Joel’s recipes<br />% cmd:hg com –m “potato chips. No one can eat just one.”<br />Commit<br />%...
Setting up for a Team<br />Joel’s Repository<br />Central Repository<br />Rose’s Repository<br />
Setting up for a Team<br />Rose’s recipes<br />% cmd:hg outgoing / hg push<br />1.outgoing<br />보낼 변경 내용<br />2.push<br />...
Setting up for a Team<br />Joel’s Repository<br />Central Repository<br />Rose’s Repository<br />
Setting up for a Team<br />Joel’s recipes<br />% cmd:hg outgoing / hg push<br />1.outgoing<br />보낼 변경 내용<br />2.push<br />...
Setting up for a Team<br />Joel’s recipes<br />Failure!<br />
Setting up for a Team<br />Joel’s recipes<br />Detailed log<br />Failure!<br />
Setting up for a Team<br />Joel’s recipes<br />% cmd:hg incoming / hg pull<br />1.incoming<br />가져올 변경 내용<br />2.pull<br /...
Setting up for a Team<br />Joel’s Repository<br />Central Repository<br />Rose’s Repository<br />
Setting up for a Team<br />Joel’s recipes<br />% cmd: type guac<br />Joel’s guac<br />
Setting up for a Team<br />Joel’s recipes<br />% cmd:hg cat –r 3 guac<br />Rose’s guac<br />
Setting up for a Team<br />Joel’s recipes<br />% cmd:hg merge<br />병합 기준으로 삼을 리비전으로 갱신 (현재 작업 영역은 rev2)<br />병합할 리비전 선택<br />
Setting up for a Team<br />Joel’s recipes<br />2.resolve<br />1.merge<br />
Setting up for a Team<br />Joel’s recipes<br />Mercurial Resolve<br />: mercurial에서 병합 처리<br />Tool Resolve<br />: 툴로 병합 처...
Setting up for a Team<br />Joel’s recipes<br />Edit File<br />: 파일 편집<br />3-Way Diff<br />: base, local, other 비교 확인<br /...
Setting up for a Team<br />Joel’s recipes<br />% cmd:hg commit –m “merge”<br />작업 영역 상태<br />커밋메시지<br />
Setting up for a Team<br />Joel’s recipes<br />% cmd:hg out / hg push<br />1.outgoing<br />보낼 변경 내용<br />2.push<br />변경 내용...
Setting up for a Team<br />Joel’s Repository<br />Central Repository<br />Rose’s Repository<br />
Setting up for a Team<br />Rose’s recipes<br />% cmd:hg pull<br />1.pull<br />% cmd:type guac<br />현재 작업 리비전<br />% cmd:hg...
Setting up for a Team<br />Rose’s recipes<br />% cmd:hg up<br />
Setting up for a Team<br />Rose’s recipes<br />% cmd:type guac<br />
Upcoming SlideShare
Loading in …5
×

2. hg init – a mercurial tutorial by tortoies hg setting up for a team

1,557 views

Published on

2. Hg Init – a Mercurial tutorial by TortoiesHg - Setting up for a Team
관련글: http://surpreem.com/archives/45

Published in: Technology
0 Comments
0 Likes
Statistics
Notes
  • Be the first to comment

  • Be the first to like this

No Downloads
Views
Total views
1,557
On SlideShare
0
From Embeds
0
Number of Embeds
402
Actions
Shares
0
Downloads
0
Comments
0
Likes
0
Embeds 0
No embeds

No notes for slide

2. hg init – a mercurial tutorial by tortoies hg setting up for a team

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

×