176 |/ |
175 |/ |
177 x de7290d8b885 (1) A0 |
176 x de7290d8b885 (1) A0 |
178 split(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
177 split(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
179 (No patch available, too many successors (4)) |
178 (No patch available, too many successors (4)) |
180 |
179 |
181 $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool |
180 $ hg obslog de7290d8b885 --hidden --all --patch |
|
181 o 1ae8bc733a14 (4) A0 |
|
182 | split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
183 | (No patch available, changesets rebased) |
|
184 | |
|
185 | o 337fec4d2edc (2) A0 |
|
186 |/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
187 | diff -r de7290d8b885 -r 337fec4d2edc b |
|
188 | --- a/b Thu Jan 01 00:00:00 1970 +0000 |
|
189 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
190 | @@ -1,1 +0,0 @@ |
|
191 | -43 |
|
192 | diff -r de7290d8b885 -r 337fec4d2edc c |
|
193 | --- a/c Thu Jan 01 00:00:00 1970 +0000 |
|
194 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
195 | @@ -1,1 +0,0 @@ |
|
196 | -44 |
|
197 | diff -r de7290d8b885 -r 337fec4d2edc d |
|
198 | --- a/d Thu Jan 01 00:00:00 1970 +0000 |
|
199 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
200 | @@ -1,1 +0,0 @@ |
|
201 | -45 |
|
202 | |
|
203 | |
|
204 | @ c7f044602e9b (5) A0 |
|
205 |/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
206 | (No patch available, changesets rebased) |
|
207 | |
|
208 | o f257fde29c7a (3) A0 |
|
209 |/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
210 | (No patch available, changesets rebased) |
|
211 | |
|
212 x de7290d8b885 (1) A0 |
|
213 |
|
214 $ hg obslog de7290d8b885 --hidden --no-graph --no-origin -Tjson | python -m json.tool |
182 [ |
215 [ |
183 { |
216 { |
184 "markers": [ |
217 "markers": [ |
185 { |
218 { |
186 "date": [ |
219 "dates": [ |
187 *, (glob) |
220 [ |
188 0 |
221 *, (glob) |
|
222 0 |
|
223 ] |
189 ], |
224 ], |
190 "effects": [ |
225 "effects": [ |
191 "parent", |
226 "parent", |
192 "content" |
227 "content" |
193 ], |
228 ], |
194 "operation": "split", |
229 "operations": [ |
|
230 "split" |
|
231 ], |
195 "succnodes": [ |
232 "succnodes": [ |
196 "1ae8bc733a14e374f11767d2ad128d4c891dc43f", |
233 "1ae8bc733a14e374f11767d2ad128d4c891dc43f", |
197 "337fec4d2edcf0e7a467e35f818234bc620068b5", |
234 "337fec4d2edcf0e7a467e35f818234bc620068b5", |
198 "c7f044602e9bd5dec6528b33114df3d0221e6359", |
235 "c7f044602e9bd5dec6528b33114df3d0221e6359", |
199 "f257fde29c7a847c9b607f6e958656d0df0fb15c" |
236 "f257fde29c7a847c9b607f6e958656d0df0fb15c" |
200 ], |
237 ], |
201 "user": "test", |
238 "users": [ |
|
239 "test" |
|
240 ], |
202 "verb": "split" |
241 "verb": "split" |
203 } |
242 } |
204 ], |
243 ], |
205 "node": "de7290d8b885925115bb9e88887252dfc20ef2a8", |
244 "node": "de7290d8b885925115bb9e88887252dfc20ef2a8", |
206 "shortdescription": "A0" |
245 "shortdescription": "A0" |
207 } |
246 } |
208 ] |
247 ] |
|
248 $ hg obslog c7f044602e9b --patch --no-origin |
|
249 @ c7f044602e9b (5) A0 |
|
250 | |
|
251 x de7290d8b885 (1) A0 |
|
252 split(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
253 (No patch available, too many successors (4)) |
|
254 |
209 $ hg obslog c7f044602e9b --patch |
255 $ hg obslog c7f044602e9b --patch |
210 @ c7f044602e9b (5) A0 |
256 @ c7f044602e9b (5) A0 |
211 | |
257 | split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
212 x de7290d8b885 (1) A0 |
258 | (No patch available, changesets rebased) |
213 split(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
259 | |
214 (No patch available, too many successors (4)) |
260 x de7290d8b885 (1) A0 |
215 |
261 |
216 $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool |
262 $ hg obslog c7f044602e9b --no-graph --no-origin -Tjson | python -m json.tool |
217 [ |
263 [ |
218 { |
264 { |
219 "markers": [], |
265 "markers": [], |
220 "node": "c7f044602e9bd5dec6528b33114df3d0221e6359", |
266 "node": "c7f044602e9bd5dec6528b33114df3d0221e6359", |
221 "shortdescription": "A0" |
267 "shortdescription": "A0" |
222 }, |
268 }, |
223 { |
269 { |
224 "markers": [ |
270 "markers": [ |
225 { |
271 { |
226 "date": [ |
272 "dates": [ |
227 *, (glob) |
273 [ |
228 0 |
274 *, (glob) |
|
275 0 |
|
276 ] |
229 ], |
277 ], |
230 "effects": [ |
278 "effects": [ |
231 "parent", |
279 "parent", |
232 "content" |
280 "content" |
233 ], |
281 ], |
234 "operation": "split", |
282 "operations": [ |
|
283 "split" |
|
284 ], |
235 "succnodes": [ |
285 "succnodes": [ |
236 "1ae8bc733a14e374f11767d2ad128d4c891dc43f", |
286 "1ae8bc733a14e374f11767d2ad128d4c891dc43f", |
237 "337fec4d2edcf0e7a467e35f818234bc620068b5", |
287 "337fec4d2edcf0e7a467e35f818234bc620068b5", |
238 "c7f044602e9bd5dec6528b33114df3d0221e6359", |
288 "c7f044602e9bd5dec6528b33114df3d0221e6359", |
239 "f257fde29c7a847c9b607f6e958656d0df0fb15c" |
289 "f257fde29c7a847c9b607f6e958656d0df0fb15c" |
240 ], |
290 ], |
241 "user": "test", |
291 "users": [ |
|
292 "test" |
|
293 ], |
242 "verb": "split" |
294 "verb": "split" |
243 } |
295 } |
244 ], |
296 ], |
245 "node": "de7290d8b885925115bb9e88887252dfc20ef2a8", |
297 "node": "de7290d8b885925115bb9e88887252dfc20ef2a8", |
246 "shortdescription": "A0" |
298 "shortdescription": "A0" |
247 } |
299 } |
248 ] |
300 ] |
249 Check that debugobshistory on all heads show a coherent graph |
301 $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool |
250 $ hg obslog 2::5 --patch |
302 [ |
|
303 { |
|
304 "markers": [ |
|
305 { |
|
306 "dates": [ |
|
307 [ |
|
308 *, (glob) |
|
309 0 |
|
310 ] |
|
311 ], |
|
312 "effects": [ |
|
313 "parent", |
|
314 "content" |
|
315 ], |
|
316 "operations": [ |
|
317 "split" |
|
318 ], |
|
319 "prednodes": [ |
|
320 "de7290d8b885925115bb9e88887252dfc20ef2a8" |
|
321 ], |
|
322 "users": [ |
|
323 "test" |
|
324 ], |
|
325 "verb": "split" |
|
326 } |
|
327 ], |
|
328 "node": "c7f044602e9bd5dec6528b33114df3d0221e6359", |
|
329 "shortdescription": "A0" |
|
330 }, |
|
331 { |
|
332 "markers": [], |
|
333 "node": "de7290d8b885925115bb9e88887252dfc20ef2a8", |
|
334 "shortdescription": "A0" |
|
335 } |
|
336 ] |
|
337 Check that obslog on all heads shows a coherent graph |
|
338 $ hg obslog 2::5 --patch --no-origin |
251 o 1ae8bc733a14 (4) A0 |
339 o 1ae8bc733a14 (4) A0 |
252 | |
340 | |
253 | o 337fec4d2edc (2) A0 |
341 | o 337fec4d2edc (2) A0 |
254 |/ |
342 |/ |
255 | @ c7f044602e9b (5) A0 |
343 | @ c7f044602e9b (5) A0 |
258 |/ |
346 |/ |
259 x de7290d8b885 (1) A0 |
347 x de7290d8b885 (1) A0 |
260 split(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
348 split(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
261 (No patch available, too many successors (4)) |
349 (No patch available, too many successors (4)) |
262 |
350 |
263 $ hg obslog 5 --all --patch |
351 $ hg obslog 2::5 --patch |
|
352 o 1ae8bc733a14 (4) A0 |
|
353 | split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
354 | (No patch available, changesets rebased) |
|
355 | |
|
356 | o 337fec4d2edc (2) A0 |
|
357 |/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
358 | diff -r de7290d8b885 -r 337fec4d2edc b |
|
359 | --- a/b Thu Jan 01 00:00:00 1970 +0000 |
|
360 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
361 | @@ -1,1 +0,0 @@ |
|
362 | -43 |
|
363 | diff -r de7290d8b885 -r 337fec4d2edc c |
|
364 | --- a/c Thu Jan 01 00:00:00 1970 +0000 |
|
365 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
366 | @@ -1,1 +0,0 @@ |
|
367 | -44 |
|
368 | diff -r de7290d8b885 -r 337fec4d2edc d |
|
369 | --- a/d Thu Jan 01 00:00:00 1970 +0000 |
|
370 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
371 | @@ -1,1 +0,0 @@ |
|
372 | -45 |
|
373 | |
|
374 | |
|
375 | @ c7f044602e9b (5) A0 |
|
376 |/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
377 | (No patch available, changesets rebased) |
|
378 | |
|
379 | o f257fde29c7a (3) A0 |
|
380 |/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
381 | (No patch available, changesets rebased) |
|
382 | |
|
383 x de7290d8b885 (1) A0 |
|
384 |
|
385 $ hg obslog 5 --all --patch --no-origin |
264 o 1ae8bc733a14 (4) A0 |
386 o 1ae8bc733a14 (4) A0 |
265 | |
387 | |
266 | o 337fec4d2edc (2) A0 |
388 | o 337fec4d2edc (2) A0 |
267 |/ |
389 |/ |
268 | @ c7f044602e9b (5) A0 |
390 | @ c7f044602e9b (5) A0 |
270 | o f257fde29c7a (3) A0 |
392 | o f257fde29c7a (3) A0 |
271 |/ |
393 |/ |
272 x de7290d8b885 (1) A0 |
394 x de7290d8b885 (1) A0 |
273 split(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
395 split(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
274 (No patch available, too many successors (4)) |
396 (No patch available, too many successors (4)) |
|
397 |
|
398 $ hg obslog 5 --all --patch |
|
399 o 1ae8bc733a14 (4) A0 |
|
400 | split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
401 | (No patch available, changesets rebased) |
|
402 | |
|
403 | o 337fec4d2edc (2) A0 |
|
404 |/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
405 | diff -r de7290d8b885 -r 337fec4d2edc b |
|
406 | --- a/b Thu Jan 01 00:00:00 1970 +0000 |
|
407 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
408 | @@ -1,1 +0,0 @@ |
|
409 | -43 |
|
410 | diff -r de7290d8b885 -r 337fec4d2edc c |
|
411 | --- a/c Thu Jan 01 00:00:00 1970 +0000 |
|
412 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
413 | @@ -1,1 +0,0 @@ |
|
414 | -44 |
|
415 | diff -r de7290d8b885 -r 337fec4d2edc d |
|
416 | --- a/d Thu Jan 01 00:00:00 1970 +0000 |
|
417 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
418 | @@ -1,1 +0,0 @@ |
|
419 | -45 |
|
420 | |
|
421 | |
|
422 | @ c7f044602e9b (5) A0 |
|
423 |/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
424 | (No patch available, changesets rebased) |
|
425 | |
|
426 | o f257fde29c7a (3) A0 |
|
427 |/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
428 | (No patch available, changesets rebased) |
|
429 | |
|
430 x de7290d8b885 (1) A0 |
275 |
431 |
276 $ hg update de7290d8b885 |
432 $ hg update de7290d8b885 |
277 abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more! |
433 abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more! |
278 (use --hidden to access hidden revisions) |
434 (use --hidden to access hidden revisions) |
279 [255] |
435 [255] |