Mercurial > evolve
diff tests/test-unstable-orphan.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 | a2273aa71a4b |
children | 79bc0f1a832e |
line wrap: on
line diff
--- a/tests/test-unstable-orphan.t Thu Apr 11 22:42:14 2019 +0200 +++ b/tests/test-unstable-orphan.t Thu Apr 11 22:44:53 2019 +0200 @@ -51,11 +51,10 @@ $ hg up "desc(_b)" 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg amend -m "bprime" - 1 new orphan changesets $ hg log -G @ 3:36050226a9b9@default(draft) bprime | - | * 2:102002290587@default(draft) add _c + | o 2:102002290587@default(draft) add _c | | | x 1:37445b16603b@default(draft) add _b |/ @@ -92,14 +91,12 @@ created new head $ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split 1 changesets pruned - 1 new orphan changesets $ hg up "desc(_a)" 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ mkcommits bsecondsplit1 bsecondsplit2 created new head $ hg prune "desc(bprimesplit1)" -s "desc(bsecondsplit2)" 1 changesets pruned - 1 new orphan changesets $ hg prune "desc(bprimesplit2)" -s "desc(bsecondsplit1)" 1 changesets pruned $ hg log -G @@ -107,7 +104,7 @@ | o 5:8ffdae67d696@default(draft) add bsecondsplit1 | - | * 2:102002290587@default(draft) add _c + | o 2:102002290587@default(draft) add _c | | | x 1:37445b16603b@default(draft) add _b |/