Mercurial > evolve
diff tests/test-evolve-obshistory-complex.t @ 4363:a2fdbece7ce1 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 22 Jan 2019 12:57:25 -0500 |
| parents | a98fa6c0d4f3 d5adce52cef4 |
| children |
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-complex.t Tue Jan 22 12:55:09 2019 -0500 +++ b/tests/test-evolve-obshistory-complex.t Tue Jan 22 12:57:25 2019 -0500 @@ -67,7 +67,6 @@ ------------------------ $ hg fold --exact -r 1 -r 2 --date "0 0" -m "fold0" - 4 new orphan changesets 2 changesets folded $ hg fold --exact -r 3 -r 4 --date "0 0" -m "fold1" 2 changesets folded @@ -94,7 +93,7 @@ | instability: orphan | summary: fold2 | - | * changeset: 8:d15d0ffc75f6 + | o changeset: 8:d15d0ffc75f6 | | parent: 2:c473644ee0e9 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 @@ -208,7 +207,6 @@ record this change to 'D'? [Ynesfdaq?] Y no more change to split - 1 new orphan changesets $ hg split --rev "desc(fold2)" -d "0 0" << EOF > Y > Y @@ -243,7 +241,6 @@ record this change to 'F'? [Ynesfdaq?] Y no more change to split - 1 new orphan changesets $ hg log -G @ changeset: 15:d4a000f63ee9 | tag: tip @@ -252,20 +249,20 @@ | instability: orphan | summary: fold2 | - * changeset: 14:ec31316faa9d + o changeset: 14:ec31316faa9d | parent: 4:868d2e0eb19c | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | instability: orphan | summary: fold2 | - | * changeset: 13:d0f33db50670 + | o changeset: 13:d0f33db50670 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | instability: orphan | | summary: fold1 | | - | * changeset: 12:7b3290f6e0a0 + | o changeset: 12:7b3290f6e0a0 | | parent: 2:c473644ee0e9 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 @@ -328,14 +325,14 @@ | instability: orphan | summary: fold2 | - * changeset: 14:ec31316faa9d + o changeset: 14:ec31316faa9d | parent: 4:868d2e0eb19c | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | instability: orphan | summary: fold2 | - | * changeset: 12:7b3290f6e0a0 + | o changeset: 12:7b3290f6e0a0 | | parent: 2:c473644ee0e9 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 @@ -384,7 +381,7 @@ walking algorithm works no matter the level of successors + precursors $ hg obslog 12 - * 7b3290f6e0a0 (12) fold1 + o 7b3290f6e0a0 (12) fold1 |\ x | d15d0ffc75f6 (8) fold1 |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000) @@ -412,11 +409,11 @@ $ hg obslog --all 15 o 19e14c8397fc (10) fold0 | - | * 7b3290f6e0a0 (12) fold1 + | o 7b3290f6e0a0 (12) fold1 | |\ | | | @ d4a000f63ee9 (15) fold2 | | | | - | | | | * ec31316faa9d (14) fold2 + | | | | o ec31316faa9d (14) fold2 | | | |/| | | | x | 100cc25b765f (9) fold2 | | | |\ \ rewritten(parent, content) as d4a000f63ee9, ec31316faa9d using split by test (Thu Jan 01 00:00:00 1970 +0000)