equal
deleted
inserted
replaced
58 |
58 |
59 $ hg rebase -s 1 -d 4 |
59 $ hg rebase -s 1 -d 4 |
60 rebasing 1:27547f69f254 "B" |
60 rebasing 1:27547f69f254 "B" |
61 rebasing 2:965c486023db "C" |
61 rebasing 2:965c486023db "C" |
62 merging A |
62 merging A |
63 warning: conflicts during merge. |
63 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
64 merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
65 unresolved conflicts (see hg resolve, then hg rebase --continue) |
64 unresolved conflicts (see hg resolve, then hg rebase --continue) |
66 [1] |
65 [1] |
67 |
66 |
68 Force a commit on C during the interruption: |
67 Force a commit on C during the interruption: |
69 |
68 |
96 |
95 |
97 $ hg rebase --continue |
96 $ hg rebase --continue |
98 already rebased 1:27547f69f254 "B" as 45396c49d53b |
97 already rebased 1:27547f69f254 "B" as 45396c49d53b |
99 rebasing 2:965c486023db "C" |
98 rebasing 2:965c486023db "C" |
100 merging A |
99 merging A |
101 warning: conflicts during merge. |
100 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
102 merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
103 unresolved conflicts (see hg resolve, then hg rebase --continue) |
101 unresolved conflicts (see hg resolve, then hg rebase --continue) |
104 [1] |
102 [1] |
105 |
103 |
106 Solve the conflict and go on: |
104 Solve the conflict and go on: |
107 |
105 |
155 |
153 |
156 $ hg rebase -s 1 -d 4 |
154 $ hg rebase -s 1 -d 4 |
157 rebasing 1:27547f69f254 "B" |
155 rebasing 1:27547f69f254 "B" |
158 rebasing 2:965c486023db "C" |
156 rebasing 2:965c486023db "C" |
159 merging A |
157 merging A |
160 warning: conflicts during merge. |
158 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
161 merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
162 unresolved conflicts (see hg resolve, then hg rebase --continue) |
159 unresolved conflicts (see hg resolve, then hg rebase --continue) |
163 [1] |
160 [1] |
164 |
161 |
165 Force a commit on B' during the interruption: |
162 Force a commit on B' during the interruption: |
166 |
163 |
228 |
225 |
229 $ hg rebase -s 1 -d 4 |
226 $ hg rebase -s 1 -d 4 |
230 rebasing 1:27547f69f254 "B" |
227 rebasing 1:27547f69f254 "B" |
231 rebasing 2:965c486023db "C" |
228 rebasing 2:965c486023db "C" |
232 merging A |
229 merging A |
233 warning: conflicts during merge. |
230 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
234 merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
235 unresolved conflicts (see hg resolve, then hg rebase --continue) |
231 unresolved conflicts (see hg resolve, then hg rebase --continue) |
236 [1] |
232 [1] |
237 |
233 |
238 Change phase on B and B' |
234 Change phase on B and B' |
239 |
235 |