Mercurial > evolve
diff tests/test-evolve-content-divergent-meta.t @ 5834:c2484b0217ee mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
# no-check-commit
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Thu, 11 Mar 2021 14:49:22 +0800 |
parents | 88f9bbba392d |
children |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-meta.t Thu Mar 11 14:48:12 2021 +0800 +++ b/tests/test-evolve-content-divergent-meta.t Thu Mar 11 14:49:22 2021 +0800 @@ -115,7 +115,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