Mercurial > evolve
comparison tests/test-rewind.t @ 4360:522abf1d70b7 mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 22 Jan 2019 12:54:44 -0500 |
| parents | 8974a05a49fa |
| children | a2fdbece7ce1 96ce1030d2fb |
comparison
equal
deleted
inserted
replaced
| 4313:4a740f9eee49 | 4360:522abf1d70b7 |
|---|---|
| 458 $ hg ci -m 'c_CD0' | 458 $ hg ci -m 'c_CD0' |
| 459 $ hg split << EOF | 459 $ hg split << EOF |
| 460 > y | 460 > y |
| 461 > f | 461 > f |
| 462 > d | 462 > d |
| 463 > y | 463 > c |
| 464 > EOF | 464 > EOF |
| 465 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 465 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 466 adding C | 466 adding C |
| 467 adding D | 467 adding D |
| 468 diff --git a/C b/C | 468 diff --git a/C b/C |
| 476 diff --git a/D b/D | 476 diff --git a/D b/D |
| 477 new file mode 100644 | 477 new file mode 100644 |
| 478 examine changes to 'D'? [Ynesfdaq?] d | 478 examine changes to 'D'? [Ynesfdaq?] d |
| 479 | 479 |
| 480 created new head | 480 created new head |
| 481 Done splitting? [yN] y | 481 continue splitting? [Ycdq?] c |
| 482 $ hg log -G | 482 $ hg log -G |
| 483 @ changeset: 5:9576e80d6851 | 483 @ changeset: 5:9576e80d6851 |
| 484 | tag: tip | 484 | tag: tip |
| 485 | user: test | 485 | user: test |
| 486 | date: Thu Jan 01 00:00:02 1970 +0000 | 486 | date: Thu Jan 01 00:00:02 1970 +0000 |