Mercurial > evolve
comparison tests/test-prev-next.t @ 5898:91207a1c4dfa mercurial-5.0
test-compat: merge mercurial-5.1 into mercurial-5.0
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 24 Apr 2021 21:34:57 +0800 |
| parents | 67fc03f42d92 34cd08a46b6d |
| children | 8bd3348c4150 6d91fe3ec0a2 |
comparison
equal
deleted
inserted
replaced
| 5897:888bed8033f1 | 5898:91207a1c4dfa |
|---|---|
| 472 abort: uncommitted changes | 472 abort: uncommitted changes |
| 473 (do you want --merge?) | 473 (do you want --merge?) |
| 474 [255] | 474 [255] |
| 475 $ hg prev --merge --config commands.update.check=abort | 475 $ hg prev --merge --config commands.update.check=abort |
| 476 file 'bar' was deleted in other [destination] but was modified in local [working copy]. | 476 file 'bar' was deleted in other [destination] but was modified in local [working copy]. |
| 477 You can use (c)hanged version, (d)elete, or leave (u)nresolved. | 477 What do you want to do? |
| 478 What do you want to do? | 478 use (c)hanged version, (d)elete, or leave (u)nresolved? |
| 479 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 479 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 480 use 'hg resolve' to retry unresolved file merges | 480 use 'hg resolve' to retry unresolved file merges |
| 481 [1] added foo | 481 [1] added foo |
| 482 | 482 |
| 483 $ hg revert --all | 483 $ hg revert --all |
| 536 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 536 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 537 reverting a | 537 reverting a |
| 538 adding b | 538 adding b |
| 539 diff --git a/a b/a | 539 diff --git a/a b/a |
| 540 1 hunks, 1 lines changed | 540 1 hunks, 1 lines changed |
| 541 examine changes to 'a'? | 541 examine changes to 'a'? [Ynesfdaq?] y |
| 542 (enter ? for help) [Ynesfdaq?] y | |
| 543 | 542 |
| 544 @@ -1,1 +1,2 @@ | 543 @@ -1,1 +1,2 @@ |
| 545 firstline | 544 firstline |
| 546 +secondline | 545 +secondline |
| 547 record change 1/2 to 'a'? | 546 record change 1/2 to 'a'? [Ynesfdaq?] y |
| 548 (enter ? for help) [Ynesfdaq?] y | |
| 549 | 547 |
| 550 diff --git a/b b/b | 548 diff --git a/b b/b |
| 551 new file mode 100644 | 549 new file mode 100644 |
| 552 examine changes to 'b'? | 550 examine changes to 'b'? [Ynesfdaq?] n |
| 553 (enter ? for help) [Ynesfdaq?] n | |
| 554 | 551 |
| 555 created new head | 552 created new head |
| 556 continue splitting? [Ycdq?] Y | 553 continue splitting? [Ycdq?] Y |
| 557 diff --git a/b b/b | 554 diff --git a/b b/b |
| 558 new file mode 100644 | 555 new file mode 100644 |
| 559 examine changes to 'b'? | 556 examine changes to 'b'? [Ynesfdaq?] y |
| 560 (enter ? for help) [Ynesfdaq?] y | |
| 561 | 557 |
| 562 @@ -0,0 +1,1 @@ | 558 @@ -0,0 +1,1 @@ |
| 563 +bbbbb | 559 +bbbbb |
| 564 record this change to 'b'? | 560 record this change to 'b'? [Ynesfdaq?] y |
| 565 (enter ? for help) [Ynesfdaq?] y | |
| 566 | 561 |
| 567 no more change to split | 562 no more change to split |
| 568 1 new orphan changesets | 563 1 new orphan changesets |
| 569 | 564 |
| 570 $ hg up 3 -q | 565 $ hg up 3 -q |