Advertisement
obs

Mercurial Issue 1877

obs
Mar 14th, 2011
104
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.37 KB | None | 0 0
  1. $ hg init bm
  2. $ cd bm
  3. $ echo 1 > f1
  4. $ hg ci -A -m initial
  5. adding f1
  6. $ hg branch dev
  7. marked working directory as branch dev
  8. $ hg ci -m "new branch dev"
  9. $ hg book -r 0 main
  10. $ hg up main
  11. 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  12. $ hg bookmarks
  13. * main 0:74b9cee424e1
  14. $ echo 2 > f1
  15. $ hg ci -m "change in main"
  16. $ hg up dev
  17. 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  18. $ hg book
  19. main 2:ed03f1c5af94
  20. $ hg merge main
  21. 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  22. (branch merge, don't forget to commit)
  23. $ hg book
  24. main 2:ed03f1c5af94
  25. $ hg ci -m "merge main into dev"
  26. $ hg book
  27. * main 3:e0ee3d29cab0
  28. $ hg glog
  29. @ changeset: 3:e0ee3d29cab0
  30. |\ branch: dev
  31. | | bookmark: main
  32. | | tag: tip
  33. | | parent: 1:922c079fed68
  34. | | parent: 2:ed03f1c5af94
  35. | | ...
  36. | | summary: merge main into dev
  37. | |
  38. | o changeset: 2:ed03f1c5af94
  39. | | parent: 0:74b9cee424e1
  40. | | ...
  41. | | summary: change in main
  42. | |
  43. o | changeset: 1:922c079fed68
  44. |/ branch: dev
  45. | ...
  46. | summary: new branch dev
  47. |
  48. o changeset: 0:74b9cee424e1
  49. ...
  50. summary: initial
  51. $ hg showconfig | grep book
  52. # no output, i.e. using only defaults for bookmark related options ...
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement