Mercurial > evolve
comparison tests/test-pick.t @ 6181:e6ae5af97683 mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 22 Feb 2022 08:19:44 +0300 |
| parents | 171d13d8f0ce |
| children | df8df57a3ce3 1328195f76a9 |
comparison
equal
deleted
inserted
replaced
| 6180:0042d69b8648 | 6181:e6ae5af97683 |
|---|---|
| 90 abort: no interrupted pick state exists | 90 abort: no interrupted pick state exists |
| 91 [255] | 91 [255] |
| 92 #if abortcommand | 92 #if abortcommand |
| 93 $ hg abort | 93 $ hg abort |
| 94 abort: no operation in progress | 94 abort: no operation in progress |
| 95 [20] | 95 [255] |
| 96 #endif | 96 #endif |
| 97 | 97 |
| 98 Specifying both continue and revs | 98 Specifying both continue and revs |
| 99 | 99 |
| 100 $ hg up 1f0dee641bb7 | 100 $ hg up 1f0dee641bb7 |
| 197 $ hg pick -r c4636a81ebeb | 197 $ hg pick -r c4636a81ebeb |
| 198 picking 6:c4636a81ebeb "add c" | 198 picking 6:c4636a81ebeb "add c" |
| 199 merging c | 199 merging c |
| 200 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 200 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 201 unresolved merge conflicts (see hg help resolve) | 201 unresolved merge conflicts (see hg help resolve) |
| 202 [240] | 202 [1] |
| 203 | 203 |
| 204 $ echo foobar > c | 204 $ echo foobar > c |
| 205 $ hg resolve --all --mark | 205 $ hg resolve --all --mark |
| 206 (no more unresolved files) | 206 (no more unresolved files) |
| 207 continue: hg pick --continue | 207 continue: hg pick --continue |
| 235 $ hg pick 4e04628911f6 | 235 $ hg pick 4e04628911f6 |
| 236 picking 9:4e04628911f6 "foo to c" | 236 picking 9:4e04628911f6 "foo to c" |
| 237 merging c | 237 merging c |
| 238 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 238 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 239 unresolved merge conflicts (see hg help resolve) | 239 unresolved merge conflicts (see hg help resolve) |
| 240 [240] | 240 [1] |
| 241 $ echo foobar > c | 241 $ echo foobar > c |
| 242 $ hg resolve -m | 242 $ hg resolve -m |
| 243 (no more unresolved files) | 243 (no more unresolved files) |
| 244 continue: hg pick --continue | 244 continue: hg pick --continue |
| 245 | 245 |
| 260 $ hg pick -r 7c15c05db6fa | 260 $ hg pick -r 7c15c05db6fa |
| 261 picking 5:7c15c05db6fa "add b" | 261 picking 5:7c15c05db6fa "add b" |
| 262 merging b | 262 merging b |
| 263 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | 263 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
| 264 unresolved merge conflicts (see hg help resolve) | 264 unresolved merge conflicts (see hg help resolve) |
| 265 [240] | 265 [1] |
| 266 | 266 |
| 267 #if abortcommand | 267 #if abortcommand |
| 268 $ hg abort --dry-run | 268 $ hg abort --dry-run |
| 269 pick in progress, will be aborted | 269 pick in progress, will be aborted |
| 270 #endif | 270 #endif |
| 321 $ hg pick -r 7c15c05db6fa | 321 $ hg pick -r 7c15c05db6fa |
| 322 picking 5:7c15c05db6fa "add b" | 322 picking 5:7c15c05db6fa "add b" |
| 323 merging b | 323 merging b |
| 324 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | 324 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
| 325 unresolved merge conflicts (see hg help resolve) | 325 unresolved merge conflicts (see hg help resolve) |
| 326 [240] | 326 [1] |
| 327 | 327 |
| 328 $ echo bar > b | 328 $ echo bar > b |
| 329 $ hg resolve -m | 329 $ hg resolve -m |
| 330 (no more unresolved files) | 330 (no more unresolved files) |
| 331 continue: hg pick --continue | 331 continue: hg pick --continue |
| 460 $ hg pick -r 1 | 460 $ hg pick -r 1 |
| 461 picking 1:892e123ebf62 "apricot and banana" | 461 picking 1:892e123ebf62 "apricot and banana" |
| 462 merging a | 462 merging a |
| 463 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 463 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 464 unresolved merge conflicts (see hg help resolve) | 464 unresolved merge conflicts (see hg help resolve) |
| 465 [240] | 465 [1] |
| 466 $ hg resolve -t :other a | 466 $ hg resolve -t :other a |
| 467 (no more unresolved files) | 467 (no more unresolved files) |
| 468 continue: hg pick --continue | 468 continue: hg pick --continue |
| 469 $ hg pick --continue | 469 $ hg pick --continue |
| 470 | 470 |