Mercurial > evolve

comparison tests/test-exchange-obsmarkers-case-A1.t @ 3108:9c9c8c1eeb93 mercurial-4.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge with mercurial-4.3 branch
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 18:34:22 +0200
parents 67b59d1657cf ccfcacc5ee7c
children
comparison
equal deleted inserted replaced
3107:1f61525727bf 3108:9c9c8c1eeb93
59 o a9bdc8b26820 (public): O 59 o a9bdc8b26820 (public): O
60 60
61 $ inspect_obsmarkers 61 $ inspect_obsmarkers
62 obsstore content 62 obsstore content
63 ================ 63 ================
64 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 64 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
65 obshashtree 65 obshashtree
66 =========== 66 ===========
67 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 67 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
68 f5bc6836db60e308a17ba08bf050154ba9c4fad7 50656e04a95ecdfed94659dd61f663b2caa55e98 68 f5bc6836db60e308a17ba08bf050154ba9c4fad7 50656e04a95ecdfed94659dd61f663b2caa55e98
69 obshashrange 69 obshashrange
86 $ dotest A.1.1.a A 86 $ dotest A.1.1.a A
87 ## Running testcase A.1.1.a 87 ## Running testcase A.1.1.a
88 # testing echange of "A" (f5bc6836db60) 88 # testing echange of "A" (f5bc6836db60)
89 ## initial state 89 ## initial state
90 # obstore: main 90 # obstore: main
91 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 91 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
92 # obstore: pushdest 92 # obstore: pushdest
93 # obstore: pulldest 93 # obstore: pulldest
94 ## pushing "A" from main to pushdest 94 ## pushing "A" from main to pushdest
95 pushing to pushdest 95 pushing to pushdest
96 searching for changes 96 searching for changes
99 remote: adding file changes 99 remote: adding file changes
100 remote: added 1 changesets with 1 changes to 1 files 100 remote: added 1 changesets with 1 changes to 1 files
101 remote: 1 new obsolescence markers 101 remote: 1 new obsolescence markers
102 ## post push state 102 ## post push state
103 # obstore: main 103 # obstore: main
104 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 104 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
105 # obstore: pushdest 105 # obstore: pushdest
106 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 106 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
107 # obstore: pulldest 107 # obstore: pulldest
108 ## pulling "f5bc6836db60" from main into pulldest 108 ## pulling "f5bc6836db60" from main into pulldest
109 pulling from main 109 pulling from main
110 searching for changes 110 searching for changes
111 adding changesets 111 adding changesets
114 added 1 changesets with 1 changes to 1 files 114 added 1 changesets with 1 changes to 1 files
115 1 new obsolescence markers 115 1 new obsolescence markers
116 (run 'hg update' to get a working copy) 116 (run 'hg update' to get a working copy)
117 ## post pull state 117 ## post pull state
118 # obstore: main 118 # obstore: main
119 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 119 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
120 # obstore: pushdest 120 # obstore: pushdest
121 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 121 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
122 # obstore: pulldest 122 # obstore: pulldest
123 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 123 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
124 124
125 Variant b: push 125 Variant b: push
126 --------------- 126 ---------------
127 127
128 $ dotest A.1.1.b 128 $ dotest A.1.1.b
129 ## Running testcase A.1.1.b 129 ## Running testcase A.1.1.b
130 ## initial state 130 ## initial state
131 # obstore: main 131 # obstore: main
132 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 132 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
133 # obstore: pushdest 133 # obstore: pushdest
134 # obstore: pulldest 134 # obstore: pulldest
135 ## pushing from main to pushdest 135 ## pushing from main to pushdest
136 pushing to pushdest 136 pushing to pushdest
137 searching for changes 137 searching for changes
140 remote: adding file changes 140 remote: adding file changes
141 remote: added 1 changesets with 1 changes to 1 files 141 remote: added 1 changesets with 1 changes to 1 files
142 remote: 1 new obsolescence markers 142 remote: 1 new obsolescence markers
143 ## post push state 143 ## post push state
144 # obstore: main 144 # obstore: main
145 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 145 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
146 # obstore: pushdest 146 # obstore: pushdest
147 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 147 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
148 # obstore: pulldest 148 # obstore: pulldest
149 ## pulling from main into pulldest 149 ## pulling from main into pulldest
150 pulling from main 150 pulling from main
151 searching for changes 151 searching for changes
152 adding changesets 152 adding changesets
155 added 1 changesets with 1 changes to 1 files 155 added 1 changesets with 1 changes to 1 files
156 1 new obsolescence markers 156 1 new obsolescence markers
157 (run 'hg update' to get a working copy) 157 (run 'hg update' to get a working copy)
158 ## post pull state 158 ## post pull state
159 # obstore: main 159 # obstore: main
160 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 160 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
161 # obstore: pushdest 161 # obstore: pushdest
162 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 162 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
163 # obstore: pulldest 163 # obstore: pulldest
164 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 164 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
165 165
166 A.1.2 pushing multiple changesets into a single head 166 A.1.2 pushing multiple changesets into a single head
167 ==================================================== 167 ====================================================
168 168
169 .. {{{ 169 .. {{{
210 210
211 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'` 211 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'`
212 $ inspect_obsmarkers 212 $ inspect_obsmarkers
213 obsstore content 213 obsstore content
214 ================ 214 ================
215 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 215 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
216 obshashtree 216 obshashtree
217 =========== 217 ===========
218 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 218 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
219 f5bc6836db60e308a17ba08bf050154ba9c4fad7 50656e04a95ecdfed94659dd61f663b2caa55e98 219 f5bc6836db60e308a17ba08bf050154ba9c4fad7 50656e04a95ecdfed94659dd61f663b2caa55e98
220 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 9cfa25b36856aa720419146abddd011cf87d368c 220 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 9cfa25b36856aa720419146abddd011cf87d368c
240 $ dotest A.1.2.a B 240 $ dotest A.1.2.a B
241 ## Running testcase A.1.2.a 241 ## Running testcase A.1.2.a
242 # testing echange of "B" (f6fbb35d8ac9) 242 # testing echange of "B" (f6fbb35d8ac9)
243 ## initial state 243 ## initial state
244 # obstore: main 244 # obstore: main
245 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 245 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
246 # obstore: pushdest 246 # obstore: pushdest
247 # obstore: pulldest 247 # obstore: pulldest
248 ## pushing "B" from main to pushdest 248 ## pushing "B" from main to pushdest
249 pushing to pushdest 249 pushing to pushdest
250 searching for changes 250 searching for changes
253 remote: adding file changes 253 remote: adding file changes
254 remote: added 2 changesets with 2 changes to 2 files 254 remote: added 2 changesets with 2 changes to 2 files
255 remote: 1 new obsolescence markers 255 remote: 1 new obsolescence markers
256 ## post push state 256 ## post push state
257 # obstore: main 257 # obstore: main
258 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 258 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
259 # obstore: pushdest 259 # obstore: pushdest
260 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 260 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
261 # obstore: pulldest 261 # obstore: pulldest
262 ## pulling "f6fbb35d8ac9" from main into pulldest 262 ## pulling "f6fbb35d8ac9" from main into pulldest
263 pulling from main 263 pulling from main
264 searching for changes 264 searching for changes
265 adding changesets 265 adding changesets
268 added 2 changesets with 2 changes to 2 files 268 added 2 changesets with 2 changes to 2 files
269 1 new obsolescence markers 269 1 new obsolescence markers
270 (run 'hg update' to get a working copy) 270 (run 'hg update' to get a working copy)
271 ## post pull state 271 ## post pull state
272 # obstore: main 272 # obstore: main
273 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 273 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
274 # obstore: pushdest 274 # obstore: pushdest
275 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 275 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
276 # obstore: pulldest 276 # obstore: pulldest
277 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 277 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
278 278
279 Variant b: push 279 Variant b: push
280 --------------- 280 ---------------
281 281
282 $ dotest A.1.2.b 282 $ dotest A.1.2.b
283 ## Running testcase A.1.2.b 283 ## Running testcase A.1.2.b
284 ## initial state 284 ## initial state
285 # obstore: main 285 # obstore: main
286 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 286 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
287 # obstore: pushdest 287 # obstore: pushdest
288 # obstore: pulldest 288 # obstore: pulldest
289 ## pushing from main to pushdest 289 ## pushing from main to pushdest
290 pushing to pushdest 290 pushing to pushdest
291 searching for changes 291 searching for changes
294 remote: adding file changes 294 remote: adding file changes
295 remote: added 2 changesets with 2 changes to 2 files 295 remote: added 2 changesets with 2 changes to 2 files
296 remote: 1 new obsolescence markers 296 remote: 1 new obsolescence markers
297 ## post push state 297 ## post push state
298 # obstore: main 298 # obstore: main
299 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 299 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
300 # obstore: pushdest 300 # obstore: pushdest
301 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 301 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
302 # obstore: pulldest 302 # obstore: pulldest
303 ## pulling from main into pulldest 303 ## pulling from main into pulldest
304 pulling from main 304 pulling from main
305 searching for changes 305 searching for changes
306 adding changesets 306 adding changesets
309 added 2 changesets with 2 changes to 2 files 309 added 2 changesets with 2 changes to 2 files
310 1 new obsolescence markers 310 1 new obsolescence markers
311 (run 'hg update' to get a working copy) 311 (run 'hg update' to get a working copy)
312 ## post pull state 312 ## post pull state
313 # obstore: main 313 # obstore: main
314 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 314 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
315 # obstore: pushdest 315 # obstore: pushdest
316 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 316 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
317 # obstore: pulldest 317 # obstore: pulldest
318 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 318 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)