This document provides an overview of version control systems including Mercurial and Git. It describes the basic commands and workflows for these distributed version control systems. Key features covered include initializing repositories, cloning, committing, branching, merging, resolving conflicts and using remote repositories over HTTP or SSH. The document also lists configuration files and public hosting services for these tools.

1. Version Control Systems Yuriy Gerasimov Madcap B.V. [email_address]

2. Centralized VCS SVN

3. CVS

4. Distributed VCS Mercurial

5. Git

6. Bazzar

7. Mercurial hg init

8. hg clone http://hg.serpentine.com/tutorial/hello

9. hg clone repo repo_clone

10. hg clone ssh://user@server//srv/hg/repo

11. Mercurial hg status (hg st)

12. hg diff

13. hg add

14. hg rm

15. hg addremove

16. Mercurial hg commit (hg ci <files> -m ‘message’)

17. hg rollback (rollback last commit)

18. hg update (hg update -C)

19. hg revert -r <rev> --all

20. hg tag

21. Mercurial hg log

22. -l5 – last 5 commits

23. --graph – graph view (-G)

24. --style compact / changelog / <custom>

25. -d’Dec 9’ – date

26. Mercurial hg pull (hg pull -u)

27. hg push

28. hg heads

29. hg merge

30. Mercurial $ hg pull ../my-hello pulling from ../my-hello searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge)

31. Mercurial

32. Mercurial hg merge hg update -C hg merge Wrong conflict resolution

33. Mercurial hg serve

34. localhost:8000

35. Mercurial .hgignore

36. hg forget

37. hg blame

38. Mercurial Mistakes Edit file. hg revert (creates .orig file)

39. File management errors (add / remove). hg revert