Mercurial > evolve
diff tests/test-wireproto.t @ 3109:3024ae293732 mercurial-4.1
test-compat: merge with mercurial-4.2 branch
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 20 Oct 2017 18:41:05 +0200 |
| parents | 00e4d31b8cdb 9c9c8c1eeb93 |
| children | d1800f4983b5 |
line wrap: on
line diff
--- a/tests/test-wireproto.t Fri Oct 20 18:34:22 2017 +0200 +++ b/tests/test-wireproto.t Fri Oct 20 18:41:05 2017 +0200 @@ -92,7 +92,7 @@ added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) obsmarker-exchange: 151 bytes received 2 new obsolescence markers - (run 'hg heads' to see heads) + (run 'hg heads' to see heads, 'hg merge' to merge) $ hg -R ../other pull pulling from ssh://user@dummy/server searching for changes @@ -147,7 +147,7 @@ added 1 changesets with 0 changes to 1 files (+1 heads) obsmarker-exchange: 227 bytes received 1 new obsolescence markers - (run 'hg heads' to see heads) + (run 'hg heads' to see heads, 'hg merge' to merge) test discovery avoid exchanging known markers