Mercurial > evolve
diff tests/test-evolve-phase-divergence.t @ 4513:d70db7e455dc mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Thu, 11 Apr 2019 22:42:13 +0200 |
parents | 522abf1d70b7 7a779a288793 |
children | f54bb6eaf5e6 3ef4980353af |
line wrap: on
line diff
--- a/tests/test-evolve-phase-divergence.t Thu Apr 11 22:41:41 2019 +0200 +++ b/tests/test-evolve-phase-divergence.t Thu Apr 11 22:42:13 2019 +0200 @@ -124,7 +124,6 @@ searching for changes no changes found 1 new phase-divergent changesets - 1 local changesets published $ hg glog @ 2:98bb3a6cfe1a tweak a @@ -294,7 +293,6 @@ searching for changes no changes found 1 new phase-divergent changesets - 1 local changesets published $ hg glog @ 4:d47f2b37ed82 added bar to foo @@ -427,7 +425,6 @@ adding file changes added 1 changesets with 1 changes to 1 files new changesets b756eb10ea73 - 1 local changesets published (run 'hg update' to get a working copy) $ hg push ../public @@ -449,7 +446,6 @@ searching for changes no changes found 1 new phase-divergent changesets - 1 local changesets published $ hg glog @ 7:2c3560aedead foo to bar @@ -580,7 +576,6 @@ searching for changes no changes found 1 new phase-divergent changesets - 1 local changesets published $ hg obslog -r . @ 334e300d6db5 (10) added x to x