comparison tests/test-exchange-A3.t @ 1078:5717d023da63

obsexc: use the common discovery We drop the hand made discovery and rely on the general one introduced some time ago.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 27 Aug 2014 17:09:36 +0200
parents f355bbc124fc
children 528c066cd51c
comparison
equal deleted inserted replaced
1077:cdfc19f25478 1078:5717d023da63
86 # obstore: pushdest 86 # obstore: pushdest
87 # obstore: pulldest 87 # obstore: pulldest
88 ## pushing "A1" from main to pushdest 88 ## pushing "A1" from main to pushdest
89 pushing to pushdest 89 pushing to pushdest
90 searching for changes 90 searching for changes
91 adding changesets
92 adding manifests
93 adding file changes
94 added 1 changesets with 1 changes to 1 files
95 OBSEXC: computing relevant nodes 91 OBSEXC: computing relevant nodes
96 OBSEXC: computing markers relevant to 2 nodes 92 OBSEXC: computing markers relevant to 2 nodes
93 adding changesets
94 adding manifests
95 adding file changes
96 added 1 changesets with 1 changes to 1 files
97 OBSEXC: pushing 1 obsolescence markers (65 bytes) 97 OBSEXC: pushing 1 obsolescence markers (65 bytes)
98 OBSEXC: DONE 98 OBSEXC: DONE
99 ## post push state 99 ## post push state
100 # obstore: main 100 # obstore: main
101 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 101 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
171 171
172 $ cd A.3.b 172 $ cd A.3.b
173 $ hg push -R main -r e5ea8f9c7314 pushdest 173 $ hg push -R main -r e5ea8f9c7314 pushdest
174 pushing to pushdest 174 pushing to pushdest
175 searching for changes 175 searching for changes
176 OBSEXC: computing relevant nodes
177 OBSEXC: computing markers relevant to 2 nodes
176 abort: push creates new remote head e5ea8f9c7314! 178 abort: push creates new remote head e5ea8f9c7314!
177 (merge or see "hg help push" for details about pushing new heads) 179 (merge or see "hg help push" for details about pushing new heads)
178 [255] 180 [255]
179 $ cd .. 181 $ cd ..
180 182
190 # obstore: pushdest 192 # obstore: pushdest
191 # obstore: pulldest 193 # obstore: pulldest
192 ## pushing "A1" from main to pushdest 194 ## pushing "A1" from main to pushdest
193 pushing to pushdest 195 pushing to pushdest
194 searching for changes 196 searching for changes
195 adding changesets
196 adding manifests
197 adding file changes
198 added 1 changesets with 1 changes to 1 files (+1 heads)
199 OBSEXC: computing relevant nodes 197 OBSEXC: computing relevant nodes
200 OBSEXC: computing markers relevant to 2 nodes 198 OBSEXC: computing markers relevant to 2 nodes
199 adding changesets
200 adding manifests
201 adding file changes
202 added 1 changesets with 1 changes to 1 files (+1 heads)
201 OBSEXC: pushing 1 obsolescence markers (65 bytes) 203 OBSEXC: pushing 1 obsolescence markers (65 bytes)
202 OBSEXC: DONE 204 OBSEXC: DONE
203 ## post push state 205 ## post push state
204 # obstore: main 206 # obstore: main
205 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 207 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}