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