Mercurial > evolve
diff tests/test-evolve-content-divergent-corner-cases.t @ 4516:f54bb6eaf5e6 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 11 Apr 2019 22:44:53 +0200 |
| parents | d70db7e455dc |
| children | aafd51f145ea |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-corner-cases.t Thu Apr 11 22:42:14 2019 +0200 +++ b/tests/test-evolve-content-divergent-corner-cases.t Thu Apr 11 22:44:53 2019 +0200 @@ -62,12 +62,11 @@ 1 changesets pruned $ hg prune -s 593c57f2117e "desc('added b')" --hidden 1 changesets pruned - 2 new content-divergent changesets $ hg log -G @ 3:8374d2ddc3a4@default(draft) divergent [content-divergent] | - | * 2:593c57f2117e@default(draft) divergent [content-divergent] + | o 2:593c57f2117e@default(draft) divergent [content-divergent] |/ o 0:9092f1db7931@default(draft) added a [] @@ -122,12 +121,11 @@ 1 changesets pruned $ hg prune -s e3ff64ce8d4c 48819a835615 --hidden 1 changesets pruned - 2 new content-divergent changesets $ hg log -G @ 7:b2ae71172042@default(draft) add _c [content-divergent] | - | * 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent] + | o 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent] |/ | o 4:45bf1312f454@default(draft) divergent [] |/ @@ -179,11 +177,10 @@ 1 changesets pruned $ hg prune -s 05a6b6a9e633 37445b16603b --hidden 1 changesets pruned - 2 new content-divergent changesets $ hg log -G @ 3:6b096fb45070@default(draft) bdivergent [content-divergent] | - | * 2:05a6b6a9e633@default(draft) bdivergent [content-divergent] + | o 2:05a6b6a9e633@default(draft) bdivergent [content-divergent] |/ o 0:135f39f4bd78@default(draft) add _a []