Guest User

hg merge with uncommited ends up with them committed togethe

a guest
Oct 21st, 2016
118
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. C:\***\test>hg init
  2.  
  3. C:\***\test>copy con f
  4. 1
  5. 2
  6. 3
  7. ^Z
  8. 1 file(s) copied.
  9.  
  10. C:\***\test>hg add f
  11.  
  12. C:\***\test>hg commit -m init
  13.  
  14. C:\***\test>copy con f
  15. 1
  16. Overwrite f? (Yes/No/All): y
  17. 2a
  18. 3
  19. ^Z
  20. 1 file(s) copied.
  21.  
  22. C:\***\test>hg commit -m a
  23.  
  24. C:\***\test>hg update 0
  25. 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  26.  
  27. C:\***\test>copy con f
  28. 1
  29. Overwrite f? (Yes/No/All): y
  30. 2b
  31. 3
  32. ^Z
  33. 1 file(s) copied.
  34.  
  35. C:\***\test>hg commit -m b
  36. created new head
  37.  
  38. C:\***\test>copy con f
  39. 1
  40. Overwrite f? (Yes/No/All): y
  41. 2bc
  42. 3
  43. ^Z
  44. 1 file(s) copied.
  45.  
  46. C:\***\test>hg merge 1
  47. abort: uncommitted changes
  48. (use 'hg status' to list changes)
  49.  
  50. C:\***\test>hg merge --force 1
  51. merging f
  52. 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
  53. (branch merge, don't forget to commit)
  54.  
  55. C:\***\test>hg commit
  56. abort: empty commit message
  57.  
  58. C:\***\test>hg commit -m merge
  59.  
  60. C:\***\test>hg status f
  61.  
  62. C:\***\test>hg diff -r 2
  63. diff -r 81867d6c4ada f
  64. --- a/f Fri Oct 21 08:39:13 2016 +0300
  65. +++ b/f Fri Oct 21 08:45:29 2016 +0300
  66. @@ -1,3 +1,3 @@
  67. 1
  68. -2b
  69. +2bc
  70. 3
RAW Paste Data