Mercurial > evolve
comparison tests/test-pick.t @ 6065:c0921b5277a0 mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
# no-check-commit
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 12 Oct 2021 11:32:36 +0300 |
| parents | 8e4f6354b316 1a13ac9ef30a |
| children | e82ad19eb3cc 171d13d8f0ce |
comparison
equal
deleted
inserted
replaced
| 6064:28a77df6e41f | 6065:c0921b5277a0 |
|---|---|
| 88 abort: no interrupted pick state exists | 88 abort: no interrupted pick state exists |
| 89 [255] | 89 [255] |
| 90 #if abortcommand | 90 #if abortcommand |
| 91 $ hg abort | 91 $ hg abort |
| 92 abort: no operation in progress | 92 abort: no operation in progress |
| 93 [20] | 93 [255] |
| 94 #endif | 94 #endif |
| 95 | 95 |
| 96 Specifying both continue and revs | 96 Specifying both continue and revs |
| 97 | 97 |
| 98 $ hg up 1f0dee641bb7 | 98 $ hg up 1f0dee641bb7 |
| 195 $ hg pick -r c4636a81ebeb | 195 $ hg pick -r c4636a81ebeb |
| 196 picking 6:c4636a81ebeb "add c" | 196 picking 6:c4636a81ebeb "add c" |
| 197 merging c | 197 merging c |
| 198 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 198 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 199 unresolved merge conflicts (see hg help resolve) | 199 unresolved merge conflicts (see hg help resolve) |
| 200 [240] | 200 [1] |
| 201 | 201 |
| 202 $ echo foobar > c | 202 $ echo foobar > c |
| 203 $ hg resolve --all --mark | 203 $ hg resolve --all --mark |
| 204 (no more unresolved files) | 204 (no more unresolved files) |
| 205 continue: hg pick --continue | 205 continue: hg pick --continue |
| 233 $ hg pick 4e04628911f6 | 233 $ hg pick 4e04628911f6 |
| 234 picking 9:4e04628911f6 "foo to c" | 234 picking 9:4e04628911f6 "foo to c" |
| 235 merging c | 235 merging c |
| 236 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 236 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 237 unresolved merge conflicts (see hg help resolve) | 237 unresolved merge conflicts (see hg help resolve) |
| 238 [240] | 238 [1] |
| 239 $ echo foobar > c | 239 $ echo foobar > c |
| 240 $ hg resolve -m | 240 $ hg resolve -m |
| 241 (no more unresolved files) | 241 (no more unresolved files) |
| 242 continue: hg pick --continue | 242 continue: hg pick --continue |
| 243 | 243 |
| 258 $ hg pick -r 7c15c05db6fa | 258 $ hg pick -r 7c15c05db6fa |
| 259 picking 5:7c15c05db6fa "add b" | 259 picking 5:7c15c05db6fa "add b" |
| 260 merging b | 260 merging b |
| 261 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | 261 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
| 262 unresolved merge conflicts (see hg help resolve) | 262 unresolved merge conflicts (see hg help resolve) |
| 263 [240] | 263 [1] |
| 264 | 264 |
| 265 #if abortcommand | 265 #if abortcommand |
| 266 $ hg abort --dry-run | 266 $ hg abort --dry-run |
| 267 pick in progress, will be aborted | 267 pick in progress, will be aborted |
| 268 #endif | 268 #endif |
| 318 $ hg pick -r 7c15c05db6fa | 318 $ hg pick -r 7c15c05db6fa |
| 319 picking 5:7c15c05db6fa "add b" | 319 picking 5:7c15c05db6fa "add b" |
| 320 merging b | 320 merging b |
| 321 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | 321 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
| 322 unresolved merge conflicts (see hg help resolve) | 322 unresolved merge conflicts (see hg help resolve) |
| 323 [240] | 323 [1] |
| 324 | 324 |
| 325 $ echo bar > b | 325 $ echo bar > b |
| 326 $ hg resolve -m | 326 $ hg resolve -m |
| 327 (no more unresolved files) | 327 (no more unresolved files) |
| 328 continue: hg pick --continue | 328 continue: hg pick --continue |
| 457 $ hg pick -r 1 | 457 $ hg pick -r 1 |
| 458 picking 1:892e123ebf62 "apricot and banana" | 458 picking 1:892e123ebf62 "apricot and banana" |
| 459 merging a | 459 merging a |
| 460 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 460 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 461 unresolved merge conflicts (see hg help resolve) | 461 unresolved merge conflicts (see hg help resolve) |
| 462 [240] | 462 [1] |
| 463 $ hg resolve -t :other a | 463 $ hg resolve -t :other a |
| 464 (no more unresolved files) | 464 (no more unresolved files) |
| 465 continue: hg pick --continue | 465 continue: hg pick --continue |
| 466 $ hg pick --continue | 466 $ hg pick --continue |
| 467 | 467 |