Mercurial > hg
comparison tests/test-rebase-interruptions.t @ 45150:dc5e5577af39
error: unify the error message formats for 'rebase' and 'unshelve'
Differential Revision: https://phab.mercurial-scm.org/D8730
author | Daniel Ploch <dploch@google.com> |
---|---|
date | Mon, 13 Jul 2020 16:42:44 -0700 |
parents | e7af56a0733e |
children | f90a5c211251 |
comparison
equal
deleted
inserted
replaced
45149:87047efbc6a6 | 45150:dc5e5577af39 |
---|---|
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 while merging A! (edit, then use 'hg resolve --mark') | 63 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
64 unresolved conflicts (see hg resolve, then hg rebase --continue) | 64 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
65 [1] | 65 [1] |
66 | 66 |
67 Force a commit on C during the interruption: | 67 Force a commit on C during the interruption: |
68 | 68 |
69 $ hg up -q -C 2 --config 'extensions.rebase=!' | 69 $ hg up -q -C 2 --config 'extensions.rebase=!' |
96 $ hg rebase --continue | 96 $ hg rebase --continue |
97 already rebased 1:27547f69f254 "B" as 45396c49d53b | 97 already rebased 1:27547f69f254 "B" as 45396c49d53b |
98 rebasing 2:965c486023db "C" | 98 rebasing 2:965c486023db "C" |
99 merging A | 99 merging A |
100 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') | 100 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
101 unresolved conflicts (see hg resolve, then hg rebase --continue) | 101 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
102 [1] | 102 [1] |
103 | 103 |
104 Solve the conflict and go on: | 104 Solve the conflict and go on: |
105 | 105 |
106 $ echo 'conflict solved' > A | 106 $ echo 'conflict solved' > A |
155 $ hg rebase -s 1 -d 4 | 155 $ hg rebase -s 1 -d 4 |
156 rebasing 1:27547f69f254 "B" | 156 rebasing 1:27547f69f254 "B" |
157 rebasing 2:965c486023db "C" | 157 rebasing 2:965c486023db "C" |
158 merging A | 158 merging A |
159 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') | 159 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
160 unresolved conflicts (see hg resolve, then hg rebase --continue) | 160 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
161 [1] | 161 [1] |
162 | 162 |
163 Force a commit on B' during the interruption: | 163 Force a commit on B' during the interruption: |
164 | 164 |
165 $ hg up -q -C 5 --config 'extensions.rebase=!' | 165 $ hg up -q -C 5 --config 'extensions.rebase=!' |
227 $ hg rebase -s 1 -d 4 | 227 $ hg rebase -s 1 -d 4 |
228 rebasing 1:27547f69f254 "B" | 228 rebasing 1:27547f69f254 "B" |
229 rebasing 2:965c486023db "C" | 229 rebasing 2:965c486023db "C" |
230 merging A | 230 merging A |
231 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') | 231 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
232 unresolved conflicts (see hg resolve, then hg rebase --continue) | 232 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
233 [1] | 233 [1] |
234 | 234 |
235 Change phase on B and B' | 235 Change phase on B and B' |
236 | 236 |
237 $ hg up -q -C 5 --config 'extensions.rebase=!' | 237 $ hg up -q -C 5 --config 'extensions.rebase=!' |
300 $ hg rebase -s 1 -d 4 | 300 $ hg rebase -s 1 -d 4 |
301 rebasing 1:27547f69f254 "B" | 301 rebasing 1:27547f69f254 "B" |
302 rebasing 2:965c486023db "C" | 302 rebasing 2:965c486023db "C" |
303 merging A | 303 merging A |
304 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') | 304 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
305 unresolved conflicts (see hg resolve, then hg rebase --continue) | 305 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
306 [1] | 306 [1] |
307 $ hg tglog | 307 $ hg tglog |
308 @ 5: 45396c49d53b 'B' | 308 @ 5: 45396c49d53b 'B' |
309 | | 309 | |
310 o 4: ae36e8e3dfd7 'E' | 310 o 4: ae36e8e3dfd7 'E' |
503 $ hg commit -qm c | 503 $ hg commit -qm c |
504 $ hg rebase -s 1 -d 2 --noninteractive | 504 $ hg rebase -s 1 -d 2 --noninteractive |
505 rebasing 1:fdaca8533b86 "b" | 505 rebasing 1:fdaca8533b86 "b" |
506 merging a | 506 merging a |
507 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 507 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
508 unresolved conflicts (see hg resolve, then hg rebase --continue) | 508 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
509 [1] | 509 [1] |
510 $ echo a > a | 510 $ echo a > a |
511 $ echo c >> a | 511 $ echo c >> a |
512 $ hg resolve --mark a | 512 $ hg resolve --mark a |
513 (no more unresolved files) | 513 (no more unresolved files) |
523 $ hg unbundle -q .hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg | 523 $ hg unbundle -q .hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg |
524 $ hg rebase -s 2 -d 1 --noninteractive --collapse | 524 $ hg rebase -s 2 -d 1 --noninteractive --collapse |
525 rebasing 2:fdaca8533b86 "b" (tip) | 525 rebasing 2:fdaca8533b86 "b" (tip) |
526 merging a | 526 merging a |
527 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 527 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
528 unresolved conflicts (see hg resolve, then hg rebase --continue) | 528 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
529 [1] | 529 [1] |
530 $ echo a > a | 530 $ echo a > a |
531 $ echo c >> a | 531 $ echo c >> a |
532 $ hg resolve --mark a | 532 $ hg resolve --mark a |
533 (no more unresolved files) | 533 (no more unresolved files) |