Advertisement
Guest User

backout problem

a guest
Nov 7th, 2013
53
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Bash 2.01 KB | None | 0 0
  1. $ # Following http://mercurial.selenic.com/wiki/Backout
  2.  
  3. $ hg init borepo
  4.  
  5. $ cd borepo
  6.  
  7. $ echo line1 > file.txt
  8. $ echo line2 >> file.txt
  9. $ hg ci -Am "add file"
  10. adding file.txt
  11.  
  12. $ gedit file.txt
  13. $ cat file.txt
  14. line1
  15. line1a
  16. line2
  17.  
  18. $ hg ci -m "add line1a"
  19.  
  20. $ echo line3 >> file.txt
  21. $ hg ci -m "add line3"
  22.  
  23. $ echo line4 >> file.txt
  24. $ hg ci -m "add line4"
  25.  
  26. $ hg glog
  27. @  changeset:   3:43b920f7b1dd
  28. |  tag:         tip
  29. |  user:        Marcin Kasperski
  30. |  date:        Thu Nov 07 13:23:54 2013 +0100
  31. |  summary:     add line4
  32. |
  33. o  changeset:   2:8d9a97440528
  34. |  user:        Marcin Kasperski
  35. |  date:        Thu Nov 07 13:23:46 2013 +0100
  36. |  summary:     add line3
  37. |
  38. o  changeset:   1:9157048d1fc3
  39. |  user:        Marcin Kasperski
  40. |  date:        Thu Nov 07 13:23:39 2013 +0100
  41. |  summary:     add line1a
  42. |
  43. o  changeset:   0:1f61d86880ab
  44.    user:        Marcin Kasperski
  45.    date:        Thu Nov 07 13:23:10 2013 +0100
  46.    summary:     add file
  47.  
  48. $ hg backout -r 1
  49. reverting file.txt
  50. merging file.txt
  51. 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
  52.  
  53. $ hg glog
  54. @  changeset:   3:43b920f7b1dd
  55. |  tag:         tip
  56. |  user:        Marcin Kasperski
  57. |  date:        Thu Nov 07 13:23:54 2013 +0100
  58. |  summary:     add line4
  59. |
  60. o  changeset:   2:8d9a97440528
  61. |  user:        Marcin Kasperski
  62. |  date:        Thu Nov 07 13:23:46 2013 +0100
  63. |  summary:     add line3
  64. |
  65. o  changeset:   1:9157048d1fc3
  66. |  user:        Marcin Kasperski
  67. |  date:        Thu Nov 07 13:23:39 2013 +0100
  68. |  summary:     add line1a
  69. |
  70. o  changeset:   0:1f61d86880ab
  71.    user:        Marcin Kasperski
  72.    date:        Thu Nov 07 13:23:10 2013 +0100
  73.    summary:     add file
  74.  
  75. $ hg stat
  76. M file.txt
  77.  
  78. $ hg version
  79. Mercurial Distributed SCM (version 2.7.2)
  80. (see http://mercurial.selenic.com for more information)
  81.  
  82. Copyright (C) 2005-2013 Matt Mackall and others
  83. This is free software; see the source for copying conditions. There is NO
  84. warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement