Advertisement
vadipp

Cutting useless hg head

Nov 2nd, 2012
30
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.56 KB | None | 0 0
  1. $ mkdir tmp
  2. $ cd tmp
  3. $ hg init
  4. $ echo "Hello world" > hello1.txt
  5. $ hg add hello1.txt
  6. $ hg ci -m "initial"
  7. $ hg glog
  8. @ changeset: 0:734d0ba76823
  9. tag: tip
  10. user: Vadim Ippolitov <vadipp@gmail.com>
  11. date: Fri Nov 02 15:18:33 2012 +0700
  12. summary: initial
  13.  
  14. $ echo "Hello change1" >
  15. .hg/ hello1.txt
  16. $ echo "Hello change1" > hello1.txt
  17. $ hg ci -m "change1"
  18. $ hg up -r 0 # go back, try something different
  19. 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  20. $ echo "Hello change2" > hello1.txt
  21. $ hg ci -m "change2"
  22. created new head
  23. $ hg glog
  24. @ changeset: 2:cb7537497910
  25. | tag: tip
  26. | parent: 0:734d0ba76823
  27. | user: Vadim Ippolitov <vadipp@gmail.com>
  28. | date: Fri Nov 02 15:19:54 2012 +0700
  29. | summary: change2
  30. |
  31. | o changeset: 1:d6ec861fcfa0
  32. |/ user: Vadim Ippolitov <vadipp@gmail.com>
  33. | date: Fri Nov 02 15:19:35 2012 +0700
  34. | summary: change1
  35. |
  36. o changeset: 0:734d0ba76823
  37. user: Vadim Ippolitov <vadipp@gmail.com>
  38. date: Fri Nov 02 15:18:33 2012 +0700
  39. summary: initial
  40.  
  41. $ #Change 1 was a bad idea, change 2 looks bteter
  42. $ hg up -r 1
  43. 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  44. $ hg commit --close-branch -m "change 1 is a bad idea, closing branch"
  45. $ hg up -c 2
  46. 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  47. $ hg heads
  48. changeset: 2:cb7537497910
  49. parent: 0:734d0ba76823
  50. user: Vadim Ippolitov <vadipp@gmail.com>
  51. date: Fri Nov 02 15:19:54 2012 +0700
  52. summary: change2
  53.  
  54. $ hg glog
  55. o changeset: 3:cbec5fc011be
  56. | tag: tip
  57. | parent: 1:d6ec861fcfa0
  58. | user: Vadim Ippolitov <vadipp@gmail.com>
  59. | date: Fri Nov 02 15:20:58 2012 +0700
  60. | summary: change 1 is a bad idea, closing branch
  61. |
  62. | @ changeset: 2:cb7537497910
  63. | | parent: 0:734d0ba76823
  64. | | user: Vadim Ippolitov <vadipp@gmail.com>
  65. | | date: Fri Nov 02 15:19:54 2012 +0700
  66. | | summary: change2
  67. | |
  68. o | changeset: 1:d6ec861fcfa0
  69. |/ user: Vadim Ippolitov <vadipp@gmail.com>
  70. | date: Fri Nov 02 15:19:35 2012 +0700
  71. | summary: change1
  72. |
  73. o changeset: 0:734d0ba76823
  74. user: Vadim Ippolitov <vadipp@gmail.com>
  75. date: Fri Nov 02 15:18:33 2012 +0700
  76. summary: initial
  77.  
  78. $ hg merge # if we try to merge, there nothing to merge - the other head was closed
  79. abort: branch 'default' has one head - please merge with an explicit rev
  80. (run 'hg heads' to see all heads)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement