| changeset 3567 | 5ddea3b8d2a4 |
| parent 3566 | e6bea259c227 |
| child 3590 | d5adce52cef4 |
| child 3663 | 54a469cd5b26 |
| 3566:e6bea259c227 | 3567:5ddea3b8d2a4 |
|---|---|
389 | summary: A0 |
389 | summary: A0 |
390 | |
390 | |
391 | x changeset: 1:471597cad322 |
391 | x changeset: 1:471597cad322 |
392 |/ user: test |
392 |/ user: test |
393 | date: Thu Jan 01 00:00:00 1970 +0000 |
393 | date: Thu Jan 01 00:00:00 1970 +0000 |
394 | obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a |
394 | obsolete: split using split as 2:337fec4d2edc, 3:f257fde29c7a |
395 | summary: A0 |
395 | summary: A0 |
396 | |
396 | |
397 o changeset: 0:ea207398892e |
397 o changeset: 0:ea207398892e |
398 user: test |
398 user: test |
399 date: Thu Jan 01 00:00:00 1970 +0000 |
399 date: Thu Jan 01 00:00:00 1970 +0000 |
403 ----------- |
403 ----------- |
404 |
404 |
405 Check that debugobshistory on splitted commit show both targets |
405 Check that debugobshistory on splitted commit show both targets |
406 $ hg obslog 471597cad322 --hidden --patch |
406 $ hg obslog 471597cad322 --hidden --patch |
407 x 471597cad322 (1) A0 |
407 x 471597cad322 (1) A0 |
408 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
408 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
409 note: testing split |
409 note: testing split |
410 (No patch available, too many successors (2)) |
410 (No patch available, too many successors (2)) |
411 |
411 |
412 $ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool |
412 $ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool |
413 [ |
413 [ |
421 "effect": [ |
421 "effect": [ |
422 "parent", |
422 "parent", |
423 "content" |
423 "content" |
424 ], |
424 ], |
425 "note": "testing split", |
425 "note": "testing split", |
426 "operation": "split", |
|
426 "succnodes": [ |
427 "succnodes": [ |
427 "337fec4d2edc", |
428 "337fec4d2edc", |
428 "f257fde29c7a" |
429 "f257fde29c7a" |
429 ], |
430 ], |
430 "user": "test", |
431 "user": "test", |
440 the revision plus the splitted one |
441 the revision plus the splitted one |
441 $ hg obslog 337fec4d2edc --patch |
442 $ hg obslog 337fec4d2edc --patch |
442 o 337fec4d2edc (2) A0 |
443 o 337fec4d2edc (2) A0 |
443 | |
444 | |
444 x 471597cad322 (1) A0 |
445 x 471597cad322 (1) A0 |
445 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
446 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
446 note: testing split |
447 note: testing split |
447 (No patch available, too many successors (2)) |
448 (No patch available, too many successors (2)) |
448 |
449 |
449 With the all option, it should show the three changesets |
450 With the all option, it should show the three changesets |
450 $ hg obslog --all 337fec4d2edc --patch |
451 $ hg obslog --all 337fec4d2edc --patch |
451 o 337fec4d2edc (2) A0 |
452 o 337fec4d2edc (2) A0 |
452 | |
453 | |
453 | @ f257fde29c7a (3) A0 |
454 | @ f257fde29c7a (3) A0 |
454 |/ |
455 |/ |
455 x 471597cad322 (1) A0 |
456 x 471597cad322 (1) A0 |
456 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
457 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
457 note: testing split |
458 note: testing split |
458 (No patch available, too many successors (2)) |
459 (No patch available, too many successors (2)) |
459 |
460 |
460 Check that debugobshistory on the second successor after split show |
461 Check that debugobshistory on the second successor after split show |
461 the revision plus the splitted one |
462 the revision plus the splitted one |
462 $ hg obslog f257fde29c7a --patch |
463 $ hg obslog f257fde29c7a --patch |
463 @ f257fde29c7a (3) A0 |
464 @ f257fde29c7a (3) A0 |
464 | |
465 | |
465 x 471597cad322 (1) A0 |
466 x 471597cad322 (1) A0 |
466 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
467 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
467 note: testing split |
468 note: testing split |
468 (No patch available, too many successors (2)) |
469 (No patch available, too many successors (2)) |
469 |
470 |
470 With the all option, it should show the three changesets |
471 With the all option, it should show the three changesets |
471 $ hg obslog f257fde29c7a --all --patch |
472 $ hg obslog f257fde29c7a --all --patch |
472 o 337fec4d2edc (2) A0 |
473 o 337fec4d2edc (2) A0 |
473 | |
474 | |
474 | @ f257fde29c7a (3) A0 |
475 | @ f257fde29c7a (3) A0 |
475 |/ |
476 |/ |
476 x 471597cad322 (1) A0 |
477 x 471597cad322 (1) A0 |
477 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
478 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
478 note: testing split |
479 note: testing split |
479 (No patch available, too many successors (2)) |
480 (No patch available, too many successors (2)) |
480 |
481 |
481 Obslog with all option all should also works on the splitted commit |
482 Obslog with all option all should also works on the splitted commit |
482 $ hg obslog -a 471597cad322 --hidden --patch |
483 $ hg obslog -a 471597cad322 --hidden --patch |
483 o 337fec4d2edc (2) A0 |
484 o 337fec4d2edc (2) A0 |
484 | |
485 | |
485 | @ f257fde29c7a (3) A0 |
486 | @ f257fde29c7a (3) A0 |
486 |/ |
487 |/ |
487 x 471597cad322 (1) A0 |
488 x 471597cad322 (1) A0 |
488 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
489 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
489 note: testing split |
490 note: testing split |
490 (No patch available, too many successors (2)) |
491 (No patch available, too many successors (2)) |
491 |
492 |
492 Check that debugobshistory on both successors after split show |
493 Check that debugobshistory on both successors after split show |
493 a coherent graph |
494 a coherent graph |
495 o 337fec4d2edc (2) A0 |
496 o 337fec4d2edc (2) A0 |
496 | |
497 | |
497 | @ f257fde29c7a (3) A0 |
498 | @ f257fde29c7a (3) A0 |
498 |/ |
499 |/ |
499 x 471597cad322 (1) A0 |
500 x 471597cad322 (1) A0 |
500 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
501 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
501 note: testing split |
502 note: testing split |
502 (No patch available, too many successors (2)) |
503 (No patch available, too many successors (2)) |
503 |
504 |
504 $ hg update 471597cad322 |
505 $ hg update 471597cad322 |
505 abort: hidden revision '471597cad322'! |
506 abort: hidden revision '471597cad322'! |
653 | summary: A0 |
654 | summary: A0 |
654 | |
655 | |
655 | x changeset: 1:de7290d8b885 |
656 | x changeset: 1:de7290d8b885 |
656 |/ user: test |
657 |/ user: test |
657 | date: Thu Jan 01 00:00:00 1970 +0000 |
658 | date: Thu Jan 01 00:00:00 1970 +0000 |
658 | obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a, 4:1ae8bc733a14, 5:c7f044602e9b |
659 | obsolete: split using split as 2:337fec4d2edc, 3:f257fde29c7a, 4:1ae8bc733a14, 5:c7f044602e9b |
659 | summary: A0 |
660 | summary: A0 |
660 | |
661 | |
661 o changeset: 0:ea207398892e |
662 o changeset: 0:ea207398892e |
662 user: test |
663 user: test |
663 date: Thu Jan 01 00:00:00 1970 +0000 |
664 date: Thu Jan 01 00:00:00 1970 +0000 |
666 Actual test |
667 Actual test |
667 ----------- |
668 ----------- |
668 |
669 |
669 $ hg obslog de7290d8b885 --hidden --patch |
670 $ hg obslog de7290d8b885 --hidden --patch |
670 x de7290d8b885 (1) A0 |
671 x de7290d8b885 (1) A0 |
671 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
672 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
672 (No patch available, too many successors (4)) |
673 (No patch available, too many successors (4)) |
673 |
674 |
674 $ hg obslog de7290d8b885 --hidden --all --patch |
675 $ hg obslog de7290d8b885 --hidden --all --patch |
675 o 1ae8bc733a14 (4) A0 |
676 o 1ae8bc733a14 (4) A0 |
676 | |
677 | |
679 | @ c7f044602e9b (5) A0 |
680 | @ c7f044602e9b (5) A0 |
680 |/ |
681 |/ |
681 | o f257fde29c7a (3) A0 |
682 | o f257fde29c7a (3) A0 |
682 |/ |
683 |/ |
683 x de7290d8b885 (1) A0 |
684 x de7290d8b885 (1) A0 |
684 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
685 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
685 (No patch available, too many successors (4)) |
686 (No patch available, too many successors (4)) |
686 |
687 |
687 $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool |
688 $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool |
688 [ |
689 [ |
689 { |
690 { |
695 ], |
696 ], |
696 "effect": [ |
697 "effect": [ |
697 "parent", |
698 "parent", |
698 "content" |
699 "content" |
699 ], |
700 ], |
701 "operation": "split", |
|
700 "succnodes": [ |
702 "succnodes": [ |
701 "1ae8bc733a14", |
703 "1ae8bc733a14", |
702 "337fec4d2edc", |
704 "337fec4d2edc", |
703 "c7f044602e9b", |
705 "c7f044602e9b", |
704 "f257fde29c7a" |
706 "f257fde29c7a" |
714 ] |
716 ] |
715 $ hg obslog c7f044602e9b --patch |
717 $ hg obslog c7f044602e9b --patch |
716 @ c7f044602e9b (5) A0 |
718 @ c7f044602e9b (5) A0 |
717 | |
719 | |
718 x de7290d8b885 (1) A0 |
720 x de7290d8b885 (1) A0 |
719 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
721 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
720 (No patch available, too many successors (4)) |
722 (No patch available, too many successors (4)) |
721 |
723 |
722 $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool |
724 $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool |
723 [ |
725 [ |
724 { |
726 { |
736 ], |
738 ], |
737 "effect": [ |
739 "effect": [ |
738 "parent", |
740 "parent", |
739 "content" |
741 "content" |
740 ], |
742 ], |
743 "operation": "split", |
|
741 "succnodes": [ |
744 "succnodes": [ |
742 "1ae8bc733a14", |
745 "1ae8bc733a14", |
743 "337fec4d2edc", |
746 "337fec4d2edc", |
744 "c7f044602e9b", |
747 "c7f044602e9b", |
745 "f257fde29c7a" |
748 "f257fde29c7a" |
762 | @ c7f044602e9b (5) A0 |
765 | @ c7f044602e9b (5) A0 |
763 |/ |
766 |/ |
764 | o f257fde29c7a (3) A0 |
767 | o f257fde29c7a (3) A0 |
765 |/ |
768 |/ |
766 x de7290d8b885 (1) A0 |
769 x de7290d8b885 (1) A0 |
767 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
770 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
768 (No patch available, too many successors (4)) |
771 (No patch available, too many successors (4)) |
769 |
772 |
770 $ hg obslog 5 --all --patch |
773 $ hg obslog 5 --all --patch |
771 o 1ae8bc733a14 (4) A0 |
774 o 1ae8bc733a14 (4) A0 |
772 | |
775 | |
775 | @ c7f044602e9b (5) A0 |
778 | @ c7f044602e9b (5) A0 |
776 |/ |
779 |/ |
777 | o f257fde29c7a (3) A0 |
780 | o f257fde29c7a (3) A0 |
778 |/ |
781 |/ |
779 x de7290d8b885 (1) A0 |
782 x de7290d8b885 (1) A0 |
780 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
783 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
781 (No patch available, too many successors (4)) |
784 (No patch available, too many successors (4)) |
782 |
785 |
783 $ hg update de7290d8b885 |
786 $ hg update de7290d8b885 |
784 abort: hidden revision 'de7290d8b885'! |
787 abort: hidden revision 'de7290d8b885'! |
785 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more) |
788 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more) |