comparison tests/test-wireproto.t @ 4892:38079b848657

branching: merge back into default
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 05 Oct 2019 14:31:19 -0400
parents a8ff17479fb8
children f3e39a354378 7d0d066329f4 cbfd36046969
comparison
equal deleted inserted replaced
4891:a9929dd36405 4892:38079b848657
70 pushing to ssh://user@dummy/server 70 pushing to ssh://user@dummy/server
71 searching for changes 71 searching for changes
72 remote: adding changesets 72 remote: adding changesets
73 remote: adding manifests 73 remote: adding manifests
74 remote: adding file changes 74 remote: adding file changes
75 remote: obsmarker-exchange: 92 bytes received
75 remote: added 1 changesets with 1 changes to 1 files (+1 heads) 76 remote: added 1 changesets with 1 changes to 1 files (+1 heads)
76 remote: obsmarker-exchange: 92 bytes received
77 remote: 1 new obsolescence markers 77 remote: 1 new obsolescence markers
78 remote: obsoleted 1 changesets 78 remote: obsoleted 1 changesets
79 $ hg push 79 $ hg push
80 pushing to ssh://user@dummy/server 80 pushing to ssh://user@dummy/server
81 searching for changes 81 searching for changes
89 pulling from ssh://user@dummy/server 89 pulling from ssh://user@dummy/server
90 searching for changes 90 searching for changes
91 adding changesets 91 adding changesets
92 adding manifests 92 adding manifests
93 adding file changes 93 adding file changes
94 obsmarker-exchange: 92 bytes received
94 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 95 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
95 obsmarker-exchange: 92 bytes received
96 1 new obsolescence markers 96 1 new obsolescence markers
97 obsoleted 1 changesets 97 obsoleted 1 changesets
98 new changesets 9d1c114e7797 (1 drafts) 98 new changesets 9d1c114e7797 (1 drafts)
99 (run 'hg heads' to see heads) 99 (run 'hg heads' to see heads)
100 $ hg -R ../other pull 100 $ hg -R ../other pull
114 pushing to ssh://user@dummy/server 114 pushing to ssh://user@dummy/server
115 searching for changes 115 searching for changes
116 remote: adding changesets 116 remote: adding changesets
117 remote: adding manifests 117 remote: adding manifests
118 remote: adding file changes 118 remote: adding file changes
119 remote: obsmarker-exchange: 92 bytes received
119 remote: added 1 changesets with 1 changes to 1 files 120 remote: added 1 changesets with 1 changes to 1 files
120 remote: obsmarker-exchange: 92 bytes received
121 remote: 1 new obsolescence markers 121 remote: 1 new obsolescence markers
122 $ hg -R ../other pull 122 $ hg -R ../other pull
123 pulling from ssh://user@dummy/server 123 pulling from ssh://user@dummy/server
124 searching for changes 124 searching for changes
125 adding changesets 125 adding changesets
126 adding manifests 126 adding manifests
127 adding file changes 127 adding file changes
128 obsmarker-exchange: 92 bytes received
128 added 1 changesets with 1 changes to 1 files 129 added 1 changesets with 1 changes to 1 files
129 obsmarker-exchange: 92 bytes received
130 1 new obsolescence markers 130 1 new obsolescence markers
131 new changesets a5687ec59dd4 (1 drafts) 131 new changesets a5687ec59dd4 (1 drafts)
132 (run 'hg update' to get a working copy) 132 (run 'hg update' to get a working copy)
133 133
134 some common hidden 134 some common hidden
138 pushing to ssh://user@dummy/server 138 pushing to ssh://user@dummy/server
139 searching for changes 139 searching for changes
140 remote: adding changesets 140 remote: adding changesets
141 remote: adding manifests 141 remote: adding manifests
142 remote: adding file changes 142 remote: adding file changes
143 remote: obsmarker-exchange: 183 bytes received
143 remote: added 1 changesets with 0 changes to 1 files (+1 heads) 144 remote: added 1 changesets with 0 changes to 1 files (+1 heads)
144 remote: obsmarker-exchange: 183 bytes received
145 remote: 1 new obsolescence markers 145 remote: 1 new obsolescence markers
146 remote: obsoleted 1 changesets 146 remote: obsoleted 1 changesets
147 $ hg -R ../other pull 147 $ hg -R ../other pull
148 pulling from ssh://user@dummy/server 148 pulling from ssh://user@dummy/server
149 searching for changes 149 searching for changes
150 adding changesets 150 adding changesets
151 adding manifests 151 adding manifests
152 adding file changes 152 adding file changes
153 obsmarker-exchange: 183 bytes received
153 added 1 changesets with 0 changes to 1 files (+1 heads) 154 added 1 changesets with 0 changes to 1 files (+1 heads)
154 obsmarker-exchange: 183 bytes received
155 1 new obsolescence markers 155 1 new obsolescence markers
156 obsoleted 1 changesets 156 obsoleted 1 changesets
157 new changesets * (glob) 157 new changesets * (glob)
158 (run 'hg heads' to see heads) 158 (run 'hg heads' to see heads)
159 159