Mercurial > evolve
comparison tests/test-prev-next.t @ 6180:0042d69b8648 mercurial-5.7
test-compat: merge mercurial-5.8 into mercurial-5.7
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 22 Feb 2022 08:00:24 +0300 |
| parents | 28a77df6e41f |
| children | 71e2408b77d0 |
comparison
equal
deleted
inserted
replaced
| 6179:4bcd641b7aec | 6180:0042d69b8648 |
|---|---|
| 429 | 429 |
| 430 $ echo bar > bar | 430 $ echo bar > bar |
| 431 $ hg prev | 431 $ hg prev |
| 432 abort: conflicting changes | 432 abort: conflicting changes |
| 433 (do you want --merge?) | 433 (do you want --merge?) |
| 434 [20] | 434 [255] |
| 435 | 435 |
| 436 $ echo hi > bar | 436 $ echo hi > bar |
| 437 $ hg prev | 437 $ hg prev |
| 438 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 438 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 439 [1] added foo | 439 [1] added foo |
| 441 $ hg add bar | 441 $ hg add bar |
| 442 | 442 |
| 443 $ hg next | 443 $ hg next |
| 444 abort: conflicting changes | 444 abort: conflicting changes |
| 445 (do you want --merge?) | 445 (do you want --merge?) |
| 446 [20] | 446 [255] |
| 447 | 447 |
| 448 Test that --merge still works fine with commands.update.check set | 448 Test that --merge still works fine with commands.update.check set |
| 449 | 449 |
| 450 $ hg config commands.update.check | 450 $ hg config commands.update.check |
| 451 noconflict | 451 noconflict |
| 452 $ echo hi > bar | 452 $ echo hi > bar |
| 453 $ echo bar >> bar | 453 $ echo bar >> bar |
| 454 $ hg next | 454 $ hg next |
| 455 abort: conflicting changes | 455 abort: conflicting changes |
| 456 (do you want --merge?) | 456 (do you want --merge?) |
| 457 [20] | 457 [255] |
| 458 $ hg next --merge | 458 $ hg next --merge |
| 459 merging bar | 459 merging bar |
| 460 warning: conflicts while merging bar! (edit, then use 'hg resolve --mark') | 460 warning: conflicts while merging bar! (edit, then use 'hg resolve --mark') |
| 461 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 461 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 462 use 'hg resolve' to retry unresolved file merges | 462 use 'hg resolve' to retry unresolved file merges |