Loading

Paste #psdnkqle4

Wrap Raw Revise
  1. ingo@aeolus hg-test default-r22 (tip) ~/hg-test $ hg phase -d .
  2. no phases changed
  3. ingo@aeolus hg-test default-r22 (tip) ~/hg-test $ hg phase -p 0
  4. ingo@aeolus hg-test default-r22 (tip) ~/hg-test $ hg glog
  5. @  22:4338c1270633 tip 2015-06-03 10:19 +0200 (planetmaker)
  6. |   Added tag \ for changeset 888a9a6be6b3
  7. |
  8. o    21:b2a1a800dcf0 2015-04-20 14:12 +0200 (planetmaker)
  9. |\      Merge. See how the bar2 receives also all changes made to the unrenamed file 'bar'
  10. | |
  11. | o  20:c5019cc5e98c 2015-04-20 14:07 +0200 (planetmaker)
  12. | |     Change bar, part 2
  13. | |
  14. | o  19:277c3869b443 2015-04-20 14:07 +0200 (planetmaker)
  15. | |     Change bar, part 1
  16. | |
  17. o |  18:8741cc4edde5 2015-04-20 14:06 +0200 (planetmaker)
  18. |/      Copy bar to bar2
  19. |
  20. o  17:f26c3b5a4767 2015-03-03 14:16 +0100 (planetmaker)
  21. |   Add: files in two directories
  22. |
  23. o    16:e7b51f7cf918 2015-02-10 22:58 +0100 (planetmaker)
  24. |\      Merge other commit
  25. | |
  26. | o  15:441bead3e0b3 2015-02-10 22:58 +0100 (planetmaker)
  27. | |     More boo
  28. | |
  29. o |  14:ba06a91db43f 2015-02-06 18:42 +0100 (planetmaker)
  30. | |     Added tag blah for changeset 888a9a6be6b3
  31. | |
  32. o |  13:e5bbe08ad8f2 2015-02-06 18:42 +0100 (planetmaker)
  33. | |     Removed tag blah
  34. | |
  35. o |  12:3c7efd514ebd 2015-02-06 18:41 +0100 (planetmaker)
  36. | |     Added tag blah for changeset 0b428aa7bdf8
  37. | |
  38. o |  11:a6d327e12bc4 foo2 2014-11-14 14:19 +0100 (planetmaker)
  39. |/      Other blah commit
  40. |
  41. o  7:36479da8f266 2014-11-11 14:07 +0100 (planetmaker)
  42. |   Move foo2
  43. |
  44. o  6:0b428aa7bdf8 2014-11-11 14:06 +0100 (planetmaker)
  45. |   copy foo
  46. |
  47. o  5:888a9a6be6b3 \ blah 2014-04-17 14:22 +0200 (planetmaker)
  48. |   -Add: New cool feature
  49. |
  50. o  4:0602f70b6892 2014-04-17 14:22 +0200 (planetmaker)
  51. |   -Codechange: Introduce foo in preparation for cool stuff
  52. |
  53. o  0:4cd637edd9b5 2014-04-17 14:20 +0200 (planetmaker)
  54.     -Add: Initial check-in
  55.  
  56. ingo@aeolus hg-test default-r22 (tip) ~/hg-test $ hg up 17
  57. 2 Dateien aktualisiert, 0 Dateien zusammengeführt, 1 Dateien entfernt, 0 Dateien ungelöst
  58. ingo@aeolus hg-test default-r17 ~/hg-test $ hg ci --amend -m "Add 2 files in directories"
  59. 5 new unstable changesets
  60. ingo@aeolus hg-test default-r23 (tip) ~/hg-test $ hg glog -l10
  61. @  23:d66c318abf69 tip 2015-03-03 14:16 +0100 (planetmaker)
  62. |   Add 2 files in directories
  63. |
  64. | o  22:4338c1270633 2015-06-03 10:19 +0200 (planetmaker)
  65. | |     Added tag \ for changeset 888a9a6be6b3
  66. | |
  67. | o    21:b2a1a800dcf0 2015-04-20 14:12 +0200 (planetmaker)
  68. | |\    Merge. See how the bar2 receives also all changes made to the unrenamed file 'bar'
  69. | | |
  70. | | o  20:c5019cc5e98c 2015-04-20 14:07 +0200 (planetmaker)
  71. | | |   Change bar, part 2
  72. | | |
  73. | | o  19:277c3869b443 2015-04-20 14:07 +0200 (planetmaker)
  74. | | |   Change bar, part 1
  75. | | |
  76. | o |  18:8741cc4edde5 2015-04-20 14:06 +0200 (planetmaker)
  77. | |/    Copy bar to bar2
  78. | |
  79. | x  17:f26c3b5a4767 2015-03-03 14:16 +0100 (planetmaker)
  80. |/      Add: files in two directories
  81. |
  82. o    16:e7b51f7cf918 2015-02-10 22:58 +0100 (planetmaker)
  83. |\      Merge other commit
  84. | |
  85. | o  15:441bead3e0b3 2015-02-10 22:58 +0100 (planetmaker)
  86. | |     More boo
  87. | |
  88. o |  14:ba06a91db43f 2015-02-06 18:42 +0100 (planetmaker)
  89. | |     Added tag blah for changeset 888a9a6be6b3
  90. | |
  91. ingo@aeolus hg-test default-r23 (tip) ~/hg-test $ hg rebase -r18 -d23
  92. rebasing 18:8741cc4edde5 "Copy bar to bar2"
  93. ingo@aeolus hg-test default-r23 ~/hg-test $ hg glog -l10
  94. o  24:df1649e9c3ae tip 2015-04-20 14:06 +0200 (planetmaker)
  95. |   Copy bar to bar2
  96. |
  97. @  23:d66c318abf69 2015-03-03 14:16 +0100 (planetmaker)
  98. |   Add 2 files in directories
  99. |
  100. | o  22:4338c1270633 2015-06-03 10:19 +0200 (planetmaker)
  101. | |     Added tag \ for changeset 888a9a6be6b3
  102. | |
  103. | o    21:b2a1a800dcf0 2015-04-20 14:12 +0200 (planetmaker)
  104. | |\    Merge. See how the bar2 receives also all changes made to the unrenamed file 'bar'
  105. | | |
  106. | | o  20:c5019cc5e98c 2015-04-20 14:07 +0200 (planetmaker)
  107. | | |   Change bar, part 2
  108. | | |
  109. | | o  19:277c3869b443 2015-04-20 14:07 +0200 (planetmaker)
  110. | | |   Change bar, part 1
  111. | | |
  112. | x |  18:8741cc4edde5 2015-04-20 14:06 +0200 (planetmaker)
  113. | |/    Copy bar to bar2
  114. | |
  115. | x  17:f26c3b5a4767 2015-03-03 14:16 +0100 (planetmaker)
  116. |/      Add: files in two directories
  117. |
  118. o    16:e7b51f7cf918 2015-02-10 22:58 +0100 (planetmaker)
  119. |\      Merge other commit
  120. | |
  121. o |  15:441bead3e0b3 2015-02-10 22:58 +0100 (planetmaker)
  122. | |     More boo
  123. | |
  124. ingo@aeolus hg-test default-r23 ~/hg-test $ hg rebase -r19 -d23
  125. rebasing 19:277c3869b443 "Change bar, part 1"
  126. ingo@aeolus hg-test default-r23 ~/hg-test $ hg glog -l10
  127. o  25:d66c046c9463 tip 2015-04-20 14:07 +0200 (planetmaker)
  128. |   Change bar, part 1
  129. |
  130. | o  24:df1649e9c3ae 2015-04-20 14:06 +0200 (planetmaker)
  131. |/      Copy bar to bar2
  132. |
  133. @  23:d66c318abf69 2015-03-03 14:16 +0100 (planetmaker)
  134. |   Add 2 files in directories
  135. |
  136. | o  22:4338c1270633 2015-06-03 10:19 +0200 (planetmaker)
  137. | |     Added tag \ for changeset 888a9a6be6b3
  138. | |
  139. | o    21:b2a1a800dcf0 2015-04-20 14:12 +0200 (planetmaker)
  140. | |\    Merge. See how the bar2 receives also all changes made to the unrenamed file 'bar'
  141. | | |
  142. | | o  20:c5019cc5e98c 2015-04-20 14:07 +0200 (planetmaker)
  143. | | |   Change bar, part 2
  144. | | |
  145. | | x  19:277c3869b443 2015-04-20 14:07 +0200 (planetmaker)
  146. | | |   Change bar, part 1
  147. | | |
  148. | x |  18:8741cc4edde5 2015-04-20 14:06 +0200 (planetmaker)
  149. | |/    Copy bar to bar2
  150. | |
  151. | x  17:f26c3b5a4767 2015-03-03 14:16 +0100 (planetmaker)
  152. |/      Add: files in two directories
  153. |
  154. o    16:e7b51f7cf918 2015-02-10 22:58 +0100 (planetmaker)
  155. |\      Merge other commit
  156. | |
  157. ingo@aeolus hg-test default-r23 ~/hg-test $ hg rebase -r20 -d25
  158. rebasing 20:c5019cc5e98c "Change bar, part 2"
  159. ingo@aeolus hg-test default-r23 ~/hg-test $ hg rebase -b21 -d24
  160. rebasing 17:f26c3b5a4767 "Add: files in two directories"
  161. note: rebase of 17:f26c3b5a4767 created no changes to commit
  162. rebasing 18:8741cc4edde5 "Copy bar to bar2"
  163. note: rebase of 18:8741cc4edde5 created no changes to commit
  164. rebasing 19:277c3869b443 "Change bar, part 1"
  165. Führe bar2 und bar zusammen zu bar2
  166. rebasing 20:c5019cc5e98c "Change bar, part 2"
  167. Führe bar2 und bar zusammen zu bar2
  168. rebasing 21:b2a1a800dcf0 "Merge. See how the bar2 receives also all changes made to the unrenamed file 'bar'"
  169. rebasing 22:4338c1270633 "Added tag \ for changeset 888a9a6be6b3"
  170. 4 new divergent changesets
  171. ingo@aeolus hg-test default-r23 ~/hg-test $ hg glog -l15
  172. o  30:e7cdac655f08 tip 2015-06-03 10:19 +0200 (planetmaker)
  173. |   Added tag \ for changeset 888a9a6be6b3
  174. |
  175. o    29:624826a28736 2015-04-20 14:12 +0200 (planetmaker)
  176. |\      Merge. See how the bar2 receives also all changes made to the unrenamed file 'bar'
  177. | |
  178. | o  28:7ecb1e7996c9 2015-04-20 14:07 +0200 (planetmaker)
  179. | |     Change bar, part 2
  180. | |
  181. | o  27:00220bf9b94b 2015-04-20 14:07 +0200 (planetmaker)
  182. |/      Change bar, part 1
  183. |
  184. | o  26:e20d83838da7 2015-04-20 14:07 +0200 (planetmaker)
  185. | |     Change bar, part 2
  186. | |
  187. | o  25:d66c046c9463 2015-04-20 14:07 +0200 (planetmaker)
  188. | |     Change bar, part 1
  189. | |
  190. o |  24:df1649e9c3ae 2015-04-20 14:06 +0200 (planetmaker)
  191. |/      Copy bar to bar2
  192. |
  193. @  23:d66c318abf69 2015-03-03 14:16 +0100 (planetmaker)
  194. |   Add 2 files in directories
  195. |
  196. o    16:e7b51f7cf918 2015-02-10 22:58 +0100 (planetmaker)
  197. |\      Merge other commit
  198. | |
  199. | o  15:441bead3e0b3 2015-02-10 22:58 +0100 (planetmaker)
  200. | |     More boo
  201. | |
  202. o |  14:ba06a91db43f 2015-02-06 18:42 +0100 (planetmaker)
  203. | |     Added tag blah for changeset 888a9a6be6b3
  204. | |
  205. o |  13:e5bbe08ad8f2 2015-02-06 18:42 +0100 (planetmaker)
  206. | |     Removed tag blah
  207. | |
  208. o |  12:3c7efd514ebd 2015-02-06 18:41 +0100 (planetmaker)
  209. | |     Added tag blah for changeset 0b428aa7bdf8
  210. | |
  211. o |  11:a6d327e12bc4 foo2 2014-11-14 14:19 +0100 (planetmaker)
  212. |/      Other blah commit
  213. |
  214. o  7:36479da8f266 2014-11-11 14:07 +0100 (planetmaker)
  215. |   Move foo2
  216. |
Posted by Anonymous at 05 Jun 2015, 08:00:36 UTC
Language: html5 • Views: 496

Comments