Mercurial > evolve
diff tests/test-wireproto.t @ 5636:3f9ef377e670 mercurial-5.1
test-compat: merge mercurial-5.2 into mercurial-5.1
# no-check-commit
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sat, 31 Oct 2020 19:10:55 +0800 |
parents | e8542915d0f7 ee18173c54a2 |
children | f0ce31fcb630 669270305ccb |
line wrap: on
line diff
--- a/tests/test-wireproto.t Sat Oct 31 19:05:48 2020 +0800 +++ b/tests/test-wireproto.t Sat Oct 31 19:10:55 2020 +0800 @@ -72,8 +72,8 @@ remote: adding changesets remote: adding manifests remote: adding file changes + remote: added 1 changesets with 1 changes to 1 files (+1 heads) remote: obsmarker-exchange: 92 bytes received - remote: added 1 changesets with 1 changes to 1 files (+1 heads) remote: 1 new obsolescence markers remote: obsoleted 1 changesets $ hg push @@ -91,8 +91,8 @@ adding changesets adding manifests adding file changes + added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) obsmarker-exchange: 92 bytes received - added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 1 new obsolescence markers obsoleted 1 changesets new changesets 9d1c114e7797 (1 drafts) @@ -116,8 +116,8 @@ remote: adding changesets remote: adding manifests remote: adding file changes + remote: added 1 changesets with 1 changes to 1 files remote: obsmarker-exchange: 92 bytes received - remote: added 1 changesets with 1 changes to 1 files remote: 1 new obsolescence markers $ hg -R ../other pull pulling from ssh://user@dummy/server @@ -125,8 +125,8 @@ adding changesets adding manifests adding file changes + added 1 changesets with 1 changes to 1 files obsmarker-exchange: 92 bytes received - added 1 changesets with 1 changes to 1 files 1 new obsolescence markers new changesets a5687ec59dd4 (1 drafts) (run 'hg update' to get a working copy) @@ -140,8 +140,8 @@ remote: adding changesets remote: adding manifests remote: adding file changes + remote: added 1 changesets with 0 changes to 1 files (+1 heads) remote: obsmarker-exchange: 183 bytes received - remote: added 1 changesets with 0 changes to 1 files (+1 heads) remote: 1 new obsolescence markers remote: obsoleted 1 changesets $ hg -R ../other pull @@ -150,8 +150,8 @@ adding changesets adding manifests adding file changes + added 1 changesets with 0 changes to 1 files (+1 heads) obsmarker-exchange: 183 bytes received - added 1 changesets with 0 changes to 1 files (+1 heads) 1 new obsolescence markers obsoleted 1 changesets new changesets * (glob)