Mercurial > evolve
diff tests/test-topic-server.t @ 5162:a7fb433faab6 mercurial-4.7
test-compat: merge mercurial-4.8 into mercurial-4.7
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sat, 29 Feb 2020 15:17:31 +0700 |
parents | e0c091b199bc |
children | d04a9bf34b79 |
line wrap: on
line diff
--- a/tests/test-topic-server.t Sat Feb 29 15:17:13 2020 +0700 +++ b/tests/test-topic-server.t Sat Feb 29 15:17:31 2020 +0700 @@ -155,7 +155,7 @@ adding manifests adding file changes added 3 changesets with 3 changes to 3 files (+1 heads) - new changesets 2a2e8b3520f2:be22ca6e89ea (3 drafts) + new changesets 2a2e8b3520f2:be22ca6e89ea (run 'hg heads' to see heads, 'hg merge' to merge) $ hg --cwd client-topic2 log -r 'all() - 0' changeset: 1:2a2e8b3520f2 @@ -187,7 +187,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets b46feb4d24f9 (1 drafts) + new changesets b46feb4d24f9 (run 'hg update' to get a working copy) $ hg --cwd client-plain phase -r 'all() - 0' 1: draft