Mercurial > evolve
diff tests/test-evolve-content-divergent-meta.t @ 4673:3ef4980353af mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 05 Jun 2019 17:45:45 +0200 |
| parents | c0e9a3c01c44 |
| children | 79bc0f1a832e 1752a2e7a226 |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-meta.t Wed Jun 05 17:42:50 2019 +0200 +++ b/tests/test-evolve-content-divergent-meta.t Wed Jun 05 17:45:45 2019 +0200 @@ -112,7 +112,7 @@ $ hg amend -m "updated c" $ hg up -r 'desc("added c")' --hidden -q - updated to hidden changeset 2b3c31fe982d + updating to a hidden changeset 2b3c31fe982d (hidden revision '2b3c31fe982d' was rewritten as: 464e35020fd0) working directory parent is obsolete! (2b3c31fe982d) $ echo coco > c