equal
deleted
inserted
replaced
59 |
59 |
60 |
60 |
61 Conflicting rebase: |
61 Conflicting rebase: |
62 |
62 |
63 $ hg rebase -s 3 -d 2 |
63 $ hg rebase -s 3 -d 2 |
|
64 rebasing 3:3163e20567cc "L1" |
|
65 rebasing 4:46f0b057b5c0 "L2" (tip) |
64 merging common |
66 merging common |
65 warning: conflicts during merge. |
67 warning: conflicts during merge. |
66 merging common incomplete! (edit conflicts, then use 'hg resolve --mark') |
68 merging common incomplete! (edit conflicts, then use 'hg resolve --mark') |
67 unresolved conflicts (see hg resolve, then hg rebase --continue) |
69 unresolved conflicts (see hg resolve, then hg rebase --continue) |
68 [1] |
70 [1] |
87 Test safety for inconsistent rebase state, which may be created (and |
89 Test safety for inconsistent rebase state, which may be created (and |
88 forgotten) by Mercurial earlier than 2.7. This emulates Mercurial |
90 forgotten) by Mercurial earlier than 2.7. This emulates Mercurial |
89 earlier than 2.7 by renaming ".hg/rebasestate" temporarily. |
91 earlier than 2.7 by renaming ".hg/rebasestate" temporarily. |
90 |
92 |
91 $ hg rebase -s 3 -d 2 |
93 $ hg rebase -s 3 -d 2 |
|
94 rebasing 3:3163e20567cc "L1" |
|
95 rebasing 4:46f0b057b5c0 "L2" (tip) |
92 merging common |
96 merging common |
93 warning: conflicts during merge. |
97 warning: conflicts during merge. |
94 merging common incomplete! (edit conflicts, then use 'hg resolve --mark') |
98 merging common incomplete! (edit conflicts, then use 'hg resolve --mark') |
95 unresolved conflicts (see hg resolve, then hg rebase --continue) |
99 unresolved conflicts (see hg resolve, then hg rebase --continue) |
96 [1] |
100 [1] |
155 | o 1:public 'B' |
159 | o 1:public 'B' |
156 |/ |
160 |/ |
157 o 0:public 'A' |
161 o 0:public 'A' |
158 |
162 |
159 $ hg rebase -b 4 -d 2 |
163 $ hg rebase -b 4 -d 2 |
|
164 rebasing 3:a6484957d6b9 "B bis" |
|
165 rebasing 4:145842775fec "C1" (tip) |
160 merging c |
166 merging c |
161 warning: conflicts during merge. |
167 warning: conflicts during merge. |
162 merging c incomplete! (edit conflicts, then use 'hg resolve --mark') |
168 merging c incomplete! (edit conflicts, then use 'hg resolve --mark') |
163 unresolved conflicts (see hg resolve, then hg rebase --continue) |
169 unresolved conflicts (see hg resolve, then hg rebase --continue) |
164 [1] |
170 [1] |
214 |/ |
220 |/ |
215 o 0 a |
221 o 0 a |
216 |
222 |
217 |
223 |
218 $ hg rebase -d master -r foo |
224 $ hg rebase -d master -r foo |
|
225 rebasing 3:6c0f977a22d8 "C" (tip foo) |
219 merging c |
226 merging c |
220 warning: conflicts during merge. |
227 warning: conflicts during merge. |
221 merging c incomplete! (edit conflicts, then use 'hg resolve --mark') |
228 merging c incomplete! (edit conflicts, then use 'hg resolve --mark') |
222 unresolved conflicts (see hg resolve, then hg rebase --continue) |
229 unresolved conflicts (see hg resolve, then hg rebase --continue) |
223 [1] |
230 [1] |