Mercurial > evolve
comparison tests/test-rewind.t @ 5159:e5fe3ca5e6ad mercurial-5.0
test-compat: merge mercurial-5.1 into mercurial-5.0
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 28 Feb 2020 23:18:48 +0700 |
| parents | d299af4da8d8 900668a93629 |
| children | e6e92835d42d |
comparison
equal
deleted
inserted
replaced
| 5158:8d20c0af010a | 5159:e5fe3ca5e6ad |
|---|---|
| 467 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 467 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 468 adding C | 468 adding C |
| 469 adding D | 469 adding D |
| 470 diff --git a/C b/C | 470 diff --git a/C b/C |
| 471 new file mode 100644 | 471 new file mode 100644 |
| 472 examine changes to 'C'? | 472 examine changes to 'C'? [Ynesfdaq?] y |
| 473 (enter ? for help) [Ynesfdaq?] y | |
| 474 | 473 |
| 475 @@ -0,0 +1,1 @@ | 474 @@ -0,0 +1,1 @@ |
| 476 +C | 475 +C |
| 477 record change 1/2 to 'C'? | 476 record change 1/2 to 'C'? [Ynesfdaq?] f |
| 478 (enter ? for help) [Ynesfdaq?] f | |
| 479 | 477 |
| 480 diff --git a/D b/D | 478 diff --git a/D b/D |
| 481 new file mode 100644 | 479 new file mode 100644 |
| 482 examine changes to 'D'? | 480 examine changes to 'D'? [Ynesfdaq?] d |
| 483 (enter ? for help) [Ynesfdaq?] d | |
| 484 | 481 |
| 485 created new head | 482 created new head |
| 486 continue splitting? [Ycdq?] c | 483 continue splitting? [Ycdq?] c |
| 487 $ hg log -G | 484 $ hg log -G |
| 488 @ changeset: 5:9576e80d6851 | 485 @ changeset: 5:9576e80d6851 |