Mercurial > evolve
comparison tests/test-rewind.t @ 5637:eed42a183d46 mercurial-5.0
test-compat: merge mercurial-5.1 into mercurial-5.0
# no-check-commit
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 31 Oct 2020 19:33:42 +0800 |
| parents | e6e92835d42d ba8bc1b0acd2 |
| children | 1dd861f4608c c2c85576ddfb |
comparison
equal
deleted
inserted
replaced
| 5636:3f9ef377e670 | 5637:eed42a183d46 |
|---|---|
| 515 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 515 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 516 adding C | 516 adding C |
| 517 adding D | 517 adding D |
| 518 diff --git a/C b/C | 518 diff --git a/C b/C |
| 519 new file mode 100644 | 519 new file mode 100644 |
| 520 examine changes to 'C'? | 520 examine changes to 'C'? [Ynesfdaq?] y |
| 521 (enter ? for help) [Ynesfdaq?] y | |
| 522 | 521 |
| 523 @@ -0,0 +1,1 @@ | 522 @@ -0,0 +1,1 @@ |
| 524 +C | 523 +C |
| 525 record change 1/2 to 'C'? | 524 record change 1/2 to 'C'? [Ynesfdaq?] f |
| 526 (enter ? for help) [Ynesfdaq?] f | |
| 527 | 525 |
| 528 diff --git a/D b/D | 526 diff --git a/D b/D |
| 529 new file mode 100644 | 527 new file mode 100644 |
| 530 examine changes to 'D'? | 528 examine changes to 'D'? [Ynesfdaq?] d |
| 531 (enter ? for help) [Ynesfdaq?] d | |
| 532 | 529 |
| 533 created new head | 530 created new head |
| 534 continue splitting? [Ycdq?] c | 531 continue splitting? [Ycdq?] c |
| 535 $ hg log -G | 532 $ hg log -G |
| 536 @ changeset: 5:9576e80d6851 | 533 @ changeset: 5:9576e80d6851 |