##// END OF EJS Templates
tests: demonstrate aborted rebase strips commits that didn't need rebasing...
Martin von Zweigbergk -
r37013:b9a6ee20 stable
parent child Browse files
Show More
@@ -69,6 +69,36 b' Can collapse commits even if one is alre'
69 |/
69 |/
70 o 0: 426bada5c675 A
70 o 0: 426bada5c675 A
71
71
72 Abort doesn't lose the commits that were already in the right place
73
74 $ hg init abort
75 $ cd abort
76 $ hg debugdrawdag <<EOF
77 > C
78 > |
79 > B D # B/file = B
80 > |/ # D/file = D
81 > A
82 > EOF
83 $ hg rebase -r C+D -d B
84 rebasing 2:ef8c0fe0897b "D" (D)
85 merging file
86 warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
87 unresolved conflicts (see hg resolve, then hg rebase --continue)
88 [1]
89 $ hg rebase --abort
90 saved backup bundle to $TESTTMP/abort/.hg/strip-backup/79f6d6ab7b14-cce2340e-backup.hg
91 rebase aborted
92 BROKEN: C got stripped
93 $ hg tglog
94 o 2: ef8c0fe0897b D
95 |
96 | o 1: 594087dbaf71 B
97 |/
98 o 0: 426bada5c675 A
99
100 $ cd ..
101
72 Rebase with "holes". The commits after the hole should end up on the parent of
102 Rebase with "holes". The commits after the hole should end up on the parent of
73 the hole (B below), not on top of the destination (A).
103 the hole (B below), not on top of the destination (A).
74
104
General Comments 0
You need to be logged in to leave comments. Login now