Your SlideShare is downloading. ×
3. hg init – a mercurial tutorial by tortoies hg   fixing goofs
Upcoming SlideShare
Loading in...5
×

Thanks for flagging this SlideShare!

Oops! An error has occurred.

×

Introducing the official SlideShare app

Stunning, full-screen experience for iPhone and Android

Text the download link to your phone

Standard text messaging rates apply

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

867
views

Published on

3. Hg Init – a Mercurial tutorial by TortoiesHg - Fixing Goofs …

3. Hg Init – a Mercurial tutorial by TortoiesHg - Fixing Goofs
관련글: 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
867
On Slideshare
0
From Embeds
0
Number of Embeds
0
Actions
Shares
0
Downloads
0
Comments
0
Likes
0
Embeds 0
No embeds

Report content
Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
No notes for slide

Transcript

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