Successfully reported this slideshow.
We use your LinkedIn profile and activity data to personalize ads and to show you more relevant ads. You can change your ad preferences anytime.

3. hg init – a mercurial tutorial by tortoies hg fixing goofs

1,412 views

Published on

3. Hg Init – a Mercurial tutorial by TortoiesHg - Fixing Goofs
관련글: http://surpreem.com/archives/45

Published in: Technology
  • Be the first to comment

  • Be the first to like this

3. hg init – a mercurial tutorial by tortoies hg fixing goofs

  1. 1. Hg Init– Mercurial tutorial<br />by TortoiseHg<br />Fixing Goofs<br />
  2. 2. Fixing Goofs<br />Joel’s recipes<br />
  3. 3. Fixing Goofs<br />Joel’s recipes<br />% cmd:hg revert guac<br />Joel’s recipes 폴더<br />되돌릴 내용을 보관하려면 선택<br />
  4. 4. Fixing Goofs<br />Joel’s recipes<br />guac<br />guac.orig<br />
  5. 5. Fixing Goofs<br />Joel’s recipes<br />% cmd:hg com –m “Pig Latin ftw”<br />
  6. 6. Fixing Goofs<br />Joel’s recipes<br />% cmd:hg rollback<br />% cmd:hg log<br />File Status<br />File Status<br />% cmd:hg stat<br />
  7. 7. Fixing Goofs<br />Joel’s recipes<br />% cmd:hg revert guac<br />Revert with backup<br />: 되돌릴 내용을 보관<br />Discard changes<br />: 되돌릴 내용 보관하지 않음<br />Cancel<br />: 취소<br />
  8. 8. Fixing Goofs<br />Joel’s recipes<br />% cmd:hg clone Joel_recipesJoel_recipes-experiment<br />Joel’s recipes-experiment 폴더<br />
  9. 9. Fixing Goofs<br />Joel’s recipes-experiment<br />% cmd:hg com –m “Queso = Cheese!”<br />
  10. 10. Fixing Goofs<br />Joel’s recipes-experiment<br />% cmd:hg push<br />Push<br />
  11. 11. Fixing Goofs<br />Joel’s recipes-experiment<br />% cmd:hg paths<br />Choice 1.<br />1.<br />incoming / outgoing / synchronize<br />2.<br />Choice 2.<br />
  12. 12. Fixing Goofs<br />Joel’s recipes<br />% cmd:hg log<br />% cmd:hg parent<br />% cmd:type guac<br />
  13. 13. Fixing Goofs<br />Joel’s recipes<br />% cmd:hg up<br />
  14. 14. Fixing Goofs<br />Joel’s recipes<br />% cmd:hg parent<br />% cmd:type guac<br />
  15. 15. Fixing Goofs<br />Joel’s Repository<br />Central Repository<br />Joel’s Experiment<br />
  16. 16. Fixing Goofs<br />Joel’s recipes-experiment<br />% cmd:hg outgoing CentralRepo<br />1. outgoing<br />
  17. 17. Fixing Goofs<br />Joel’s recipes-experiment<br />% cmd:hg outgoing CentralRepo<br />3.outgoing<br />2. 중앙 저장소 선택<br />
  18. 18. Fixing Goofs<br />Joel’s recipes-experiment<br />% cmd:hg push CentralRepo<br />4. push<br />
  19. 19. Fixing Goofs<br />Joel’s recipes<br />% cmd:hg out<br />outgoing<br />
  20. 20. Fixing Goofs<br />Joel’s recipes<br />% cmd:hg diff –r 1:2 guac<br />2. Ctrl/Shift + Click: rev2<br />1. Click: rev1<br />3.<br />
  21. 21. Fixing Goofs<br />Joel’s recipes<br />% cmd:hg backout –r 2 --merge<br />
  22. 22. Fixing Goofs<br />Joel’s recipes<br />% cmd:hg backout –r 2 --merge<br />2.<br />1.<br />
  23. 23. Fixing Goofs<br />Joel’s recipes<br />Beyond Compare 3 Pro<br />Cf.<br />backout결과 rev1 내용으로 바뀜<br />backout결과 자동 병합 완료<br />
  24. 24. Fixing Goofs<br />Joel’s recipes<br />% cmd:hg diff<br />
  25. 25. Fixing Goofs<br />Joel’s recipes<br />% cmd:hg com –m “undo thing from the past”<br />
  26. 26. Fixing Goofs<br />Joel’s recipes<br />% cmd:hg backout –r 2 –merge(result)<br />
  27. 27. Fixing Goofs<br />Joel’s recipes<br />% cmd:hg push<br />
  28. 28. Fixing Goofs<br />Joel’s recipes<br />[Bonus] % cmd:hg backout –r 2<br />2.<br />1.<br />
  29. 29. Fixing Goofs<br />Joel’s recipes<br />Beyond Compare 3 Pro<br />Cf.<br />backout결과 rev1 내용으로 바뀜<br />
  30. 30. Fixing Goofs<br />Joel’s recipes<br />% cmd:hg diff<br />병합함<br />
  31. 31. Fixing Goofs<br />Joel’s recipes<br />Beyond Compare 3 Pro<br />병합결과<br />
  32. 32. Fixing Goofs<br />Joel’s recipes<br />% cmd:hg com –m “undo thing from the past”<br />
  33. 33. Fixing Goofs<br />Joel’s recipes<br />% cmd:hg backout –r 2 (result)<br />

×