Mercurial > evolve
diff tests/test-evolve-obshistory-complex.t @ 3431:2e703ed1c713
evolve: update output for wider reporting of troubled changesets
CORE-TEST-OUTPUT-UPDATE: 1a09dad8b85a
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Sat, 13 Jan 2018 14:35:49 -0800 |
| parents | d3a17c67f85c |
| children | d166b3dc5e8a |
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-complex.t Fri Jan 19 19:18:05 2018 +0100 +++ b/tests/test-evolve-obshistory-complex.t Sat Jan 13 14:35:49 2018 -0800 @@ -67,8 +67,8 @@ ------------------------ $ hg fold --exact -r 1 -r 2 --date "0 0" -m "fold0" + 4 new orphan changesets 2 changesets folded - 4 new orphan changesets $ hg fold --exact -r 3 -r 4 --date "0 0" -m "fold1" 2 changesets folded $ hg fold --exact -r 5 -r 6 --date "0 0" -m "fold2" -n "folding changesets to test" @@ -208,6 +208,7 @@ record this change to 'D'? [Ynesfdaq?] Y no more change to split + 1 new orphan changesets $ hg split "desc(fold2)" -d "0 0" << EOF > Y > Y @@ -242,6 +243,7 @@ record this change to 'F'? [Ynesfdaq?] Y no more change to split + 1 new orphan changesets $ hg log -G @ changeset: 15:d4a000f63ee9 | tag: tip