Mercurial > evolve
diff tests/test-evolve-content-divergent-stack.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 | 7a779a288793 |
| children | aafd51f145ea |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-stack.t Thu Apr 11 22:42:14 2019 +0200 +++ b/tests/test-evolve-content-divergent-stack.t Thu Apr 11 22:44:53 2019 +0200 @@ -64,7 +64,6 @@ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo bar > a $ hg amend -m "watbar to a" - 3 new orphan changesets $ echo wat > a $ hg amend -m "watbar to a" $ hg evolve --all @@ -90,7 +89,6 @@ 0 files updated, 0 files merged, 3 files removed, 0 files unresolved $ echo wat > a $ hg amend -m "watbar to a" - 3 new orphan changesets $ hg evolve --all move:[2] added b atop:[5] watbar to a @@ -117,26 +115,25 @@ adding file changes added 4 changesets with 0 changes to 4 files (+1 heads) 5 new obsolescence markers - 8 new content-divergent changesets new changesets 82b74d5dc678:15c781f93cac (run 'hg heads' to see heads, 'hg merge' to merge) $ hg glog - * 12:15c781f93cac added d + o 12:15c781f93cac added d | () [default] draft - * 11:9e5fb1d5b955 added c + o 11:9e5fb1d5b955 added c | () [default] draft - * 10:88516dccf68a added b + o 10:88516dccf68a added b | () [default] draft - * 9:82b74d5dc678 watbar to a + o 9:82b74d5dc678 watbar to a | () [default] draft | @ 8:c72d2885eb51 added d | | () [default] draft - | * 7:3ce4be6d8e5e added c + | o 7:3ce4be6d8e5e added c | | () [default] draft - | * 6:d5f148423c16 added b + | o 6:d5f148423c16 added b | | () [default] draft - | * 5:8e222f257bbf watbar to a + | o 5:8e222f257bbf watbar to a |/ () [default] draft o 0:8fa14d15e168 added hgignore () [default] draft @@ -148,7 +145,6 @@ updating to "local" side of the conflict: 8e222f257bbf merging "other" content-divergent changeset '82b74d5dc678' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - 6 new orphan changesets merge:[6] added b with: [10] added b base: [2] added b