Loading

Paste #pjhfmnwy3

Wrap Raw Revise
  1. planetmaker@localhost hg-test branch5-r60 (tip) ~/hg-test $ hg branches
  2. branch5                       60:b617ee61aaf4
  3. default                       37:3a1e58edd9d6
  4. branch1                       39:8ba3f8c93261 (inaktiv)
  5. planetmaker@localhost hg-test branch5-r60 (tip) ~/hg-test $ hg up branch5
  6. 0 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst
  7. planetmaker@localhost hg-test branch5-r60 (tip) ~/hg-test $ ls
  8. abc  bar  blah  diff.diff  dir1  dir2  eee  eef  eeg  foo  foo22
  9. planetmaker@localhost hg-test branch5-r60 (tip) ~/hg-test $ echo blah > customer
  10. planetmaker@localhost hg-test branch5-r60 (tip) ~/hg-test $ hg add customer
  11. planetmaker@localhost hg-test branch5-r60 (tip) ~/hg-test $ hg st
  12. M abc
  13. M eee
  14. M eef
  15. M eeg
  16. A customer
  17. planetmaker@localhost hg-test branch5-r60 (tip) ~/hg-test $ hg ci -m "Add customer" customer
  18. planetmaker@localhost hg-test branch5-r61 (tip) ~/hg-test $ hg ci -m "Add some other stuff"
  19. planetmaker@localhost hg-test branch5-r62 (tip) ~/hg-test $ hg up default
  20. 1 Dateien aktualisiert, 0 Dateien zusammengeführt, 7 Dateien entfernt, 0 Dateien ungelöst
  21. planetmaker@localhost hg-test default-r37 ~/hg-test $ hg merge branch5
  22. 8 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst
  23. (Zusammenführen von Zweigen, vergiss nicht 'hg commit' auszuführen)
  24. planetmaker@localhost hg-test default-r37 ~/hg-test $ hg st
  25. M .hgtags
  26. M abc
  27. M customer
  28. M dir1/f1
  29. M dir2/f2
  30. M eee
  31. M eef
  32. M eeg
  33. planetmaker@localhost hg-test default-r37 ~/hg-test $ hg forget customer
  34. planetmaker@localhost hg-test default-r37 ~/hg-test $ hg st
  35. M .hgtags
  36. M abc
  37. M dir1/f1
  38. M dir2/f2
  39. M eee
  40. M eef
  41. M eeg
  42. R customer
  43. planetmaker@localhost hg-test default-r37 ~/hg-test $ hg ci -m "Merge with branch5"
  44. planetmaker@localhost hg-test default-r63 (tip) ~/hg-test $ hg glog -l5
  45. @    default-63:834286e2c2f4 tip 2016-07-19 12:38 +0200 (planetmaker)
  46. |\      Merge with branch5
  47. | |
  48. o |  branch5-62:84f3665e87da 2016-07-19 12:38 +0200 (planetmaker)
  49. | |     Add some other stuff
  50. | |
  51. o |  branch5-61:bd2bb4ee36c5 2016-07-19 12:37 +0200 (planetmaker)
  52. | |     Add customer
  53. | |
  54. o |  branch5-60:b617ee61aaf4 2016-05-18 16:40 +0200 (planetmaker)
  55. | |     Add some files
  56. | |
  57. o |  branch5-59:606950897283 2016-04-07 13:42 +0200 (planetmaker)
  58. | |     Backed out changeset a2475f86f207
  59. | |
  60. planetmaker@localhost hg-test default-r63 (tip) ~/hg-test $ echo blah >>
  61. abc        bar        blah       customer   diff.diff  dir1/      dir2/      eee        eef        eeg        foo        foo22      .hg/       .hgtags    
  62. planetmaker@localhost hg-test default-r63 (tip) ~/hg-test $ echo blah >> blah
  63. planetmaker@localhost hg-test default-r63 (tip) ~/hg-test $ hg ci -m "More blah in blah"
  64. hplanetmaker@localhost hg-test default-r64 (tip) ~/hg-test $ hg up branch5
  65. 2 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst
  66. planetmaker@localhost hg-test branch5-r62 ~/hg-test $ hg st
  67. planetmaker@localhost hg-test branch5-r62 ~/hg-test $ echo bla bla >> customer
  68. planetmaker@localhost hg-test branch5-r62 ~/hg-test $ hg ci -m "More customer stuff"
  69. planetmaker@localhost hg-test branch5-r65 (tip) ~/hg-test $ hg up default
  70. 1 Dateien aktualisiert, 0 Dateien zusammengeführt, 1 Dateien entfernt, 0 Dateien ungelöst
  71. planetmaker@localhost hg-test default-r64 ~/hg-test $ hg glog -l5
  72. o  branch5-65:2a24bda48baf tip 2016-07-19 12:39 +0200 (planetmaker)
  73. |       More customer stuff
  74. |
  75. | @  default-64:e3faeba870a4 2016-07-19 12:39 +0200 (planetmaker)
  76. | |     More blah in blah
  77. | |
  78. | o  default-63:834286e2c2f4 2016-07-19 12:38 +0200 (planetmaker)
  79. |/|     Merge with branch5
  80. | |
  81. o |  branch5-62:84f3665e87da 2016-07-19 12:38 +0200 (planetmaker)
  82. | |     Add some other stuff
  83. | |
  84. o |  branch5-61:bd2bb4ee36c5 2016-07-19 12:37 +0200 (planetmaker)
  85. | |     Add customer
  86. | |
  87. planetmaker@localhost hg-test default-r64 ~/hg-test $ hg merge branch5
  88. remote changed customer which local deleted
  89. use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d
  90. 0 Dateien aktualisiert, 1 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst
  91. (Zusammenführen von Zweigen, vergiss nicht 'hg commit' auszuführen)
  92. planetmaker@localhost hg-test default-r64 ~/hg-test $ hg st
  93. planetmaker@localhost hg-test default-r64 ~/hg-test $ hg ci -m "New merge"
  94. planetmaker@localhost hg-test default-r66 (tip) ~/hg-test $ hg glog -l5
  95. @    default-66:d750c468b0ba tip 2016-07-19 12:41 +0200 (planetmaker)
  96. |\      New merge
  97. | |
  98. | o  branch5-65:2a24bda48baf 2016-07-19 12:39 +0200 (planetmaker)
  99. | |     More customer stuff
  100. | |
  101. o |  default-64:e3faeba870a4 2016-07-19 12:39 +0200 (planetmaker)
  102. | |     More blah in blah
  103. | |
  104. o |  default-63:834286e2c2f4 2016-07-19 12:38 +0200 (planetmaker)
  105. |\|     Merge with branch5
  106. | |
  107. | o  branch5-62:84f3665e87da 2016-07-19 12:38 +0200 (planetmaker)
  108. | |     Add some other stuff
  109. | |
Posted by Anonymous at 19 Jul 2016, 10:48:54 UTC
Language: c • Views: 442

Comments