changeset 3013 | 945a0989e41b |
parent 3000 | bd7e8be29542 |
child 3054 | bc890c6c9b2f |
3012:081070828703 | 3013:945a0989e41b |
---|---|
29 $ echo 42 >> A0 |
29 $ echo 42 >> A0 |
30 $ hg amend -m "A1 |
30 $ hg amend -m "A1 |
31 > |
31 > |
32 > Better commit message" |
32 > Better commit message" |
33 $ hg log --hidden -G |
33 $ hg log --hidden -G |
34 @ changeset: 3:4ae3a4151de9 |
34 @ changeset: 2:4ae3a4151de9 |
35 | tag: tip |
35 | tag: tip |
36 | parent: 0:ea207398892e |
36 | parent: 0:ea207398892e |
37 | user: test |
37 | user: test |
38 | date: Thu Jan 01 00:00:00 1970 +0000 |
38 | date: Thu Jan 01 00:00:00 1970 +0000 |
39 | summary: A1 |
39 | summary: A1 |
40 | |
40 | |
41 | x changeset: 2:f137d23bb3e1 |
|
42 | | user: test |
|
43 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
44 | | obsolete: pruned |
|
45 | | summary: temporary amend commit for 471f378eab4c |
|
46 | | |
|
47 | x changeset: 1:471f378eab4c |
41 | x changeset: 1:471f378eab4c |
48 |/ user: test |
42 |/ user: test |
49 | date: Thu Jan 01 00:00:00 1970 +0000 |
43 | date: Thu Jan 01 00:00:00 1970 +0000 |
50 | obsolete: rewritten as 4ae3a4151de9 |
44 | obsolete: rewritten as 4ae3a4151de9 |
51 | summary: A0 |
45 | summary: A0 |
56 summary: ROOT |
50 summary: ROOT |
57 |
51 |
58 Actual test |
52 Actual test |
59 ----------- |
53 ----------- |
60 $ hg obslog --patch 4ae3a4151de9 |
54 $ hg obslog --patch 4ae3a4151de9 |
61 @ 4ae3a4151de9 (3) A1 |
55 @ 4ae3a4151de9 (2) A1 |
62 | |
56 | |
63 x 471f378eab4c (1) A0 |
57 x 471f378eab4c (1) A0 |
64 rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000) |
58 rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) |
65 --- a/471f378eab4c-changeset-description |
59 --- a/471f378eab4c-changeset-description |
66 +++ b/4ae3a4151de9-changeset-description |
60 +++ b/4ae3a4151de9-changeset-description |
67 @@ -1,1 +1,3 @@ |
61 @@ -1,1 +1,3 @@ |
68 -A0 |
62 -A0 |
69 +A1 |
63 +A1 |
78 +42 |
72 +42 |
79 |
73 |
80 |
74 |
81 |
75 |
82 $ hg obslog --no-graph --patch 4ae3a4151de9 |
76 $ hg obslog --no-graph --patch 4ae3a4151de9 |
83 4ae3a4151de9 (3) A1 |
77 4ae3a4151de9 (2) A1 |
84 471f378eab4c (1) A0 |
78 471f378eab4c (1) A0 |
85 rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000) |
79 rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000) |
86 --- a/471f378eab4c-changeset-description |
80 --- a/471f378eab4c-changeset-description |
87 +++ b/4ae3a4151de9-changeset-description |
81 +++ b/4ae3a4151de9-changeset-description |
88 @@ -1,1 +1,3 @@ |
82 @@ -1,1 +1,3 @@ |
107 $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool |
101 $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool |
108 [ |
102 [ |
109 { |
103 { |
110 "markers": [], |
104 "markers": [], |
111 "node": "4ae3a4151de9", |
105 "node": "4ae3a4151de9", |
112 "rev": 3, |
106 "rev": 2, |
113 "shortdescription": "A1" |
107 "shortdescription": "A1" |
114 }, |
108 }, |
115 { |
109 { |
116 "markers": [ |
110 "markers": [ |
117 { |
111 { |
135 "shortdescription": "A0" |
129 "shortdescription": "A0" |
136 } |
130 } |
137 ] |
131 ] |
138 $ hg obslog --hidden --patch 471f378eab4c |
132 $ hg obslog --hidden --patch 471f378eab4c |
139 x 471f378eab4c (1) A0 |
133 x 471f378eab4c (1) A0 |
140 rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000) |
134 rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) |
141 --- a/471f378eab4c-changeset-description |
135 --- a/471f378eab4c-changeset-description |
142 +++ b/4ae3a4151de9-changeset-description |
136 +++ b/4ae3a4151de9-changeset-description |
143 @@ -1,1 +1,3 @@ |
137 @@ -1,1 +1,3 @@ |
144 -A0 |
138 -A0 |
145 +A1 |
139 +A1 |
377 ----------- |
371 ----------- |
378 |
372 |
379 Check that debugobshistory on splitted commit show both targets |
373 Check that debugobshistory on splitted commit show both targets |
380 $ hg obslog 471597cad322 --hidden --patch |
374 $ hg obslog 471597cad322 --hidden --patch |
381 x 471597cad322 (1) A0 |
375 x 471597cad322 (1) A0 |
382 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
376 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
383 (No patch available yet, too many successors (2)) |
377 (No patch available yet, too many successors (2)) |
384 |
378 |
385 $ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool |
379 $ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool |
386 [ |
380 [ |
387 { |
381 { |
412 the revision plus the splitted one |
406 the revision plus the splitted one |
413 $ hg obslog 337fec4d2edc --patch |
407 $ hg obslog 337fec4d2edc --patch |
414 o 337fec4d2edc (2) A0 |
408 o 337fec4d2edc (2) A0 |
415 | |
409 | |
416 x 471597cad322 (1) A0 |
410 x 471597cad322 (1) A0 |
417 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
411 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
418 (No patch available yet, too many successors (2)) |
412 (No patch available yet, too many successors (2)) |
419 |
413 |
420 With the all option, it should show the three changesets |
414 With the all option, it should show the three changesets |
421 $ hg obslog --all 337fec4d2edc --patch |
415 $ hg obslog --all 337fec4d2edc --patch |
422 o 337fec4d2edc (2) A0 |
416 o 337fec4d2edc (2) A0 |
423 | |
417 | |
424 | @ f257fde29c7a (3) A0 |
418 | @ f257fde29c7a (3) A0 |
425 |/ |
419 |/ |
426 x 471597cad322 (1) A0 |
420 x 471597cad322 (1) A0 |
427 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
421 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
428 (No patch available yet, too many successors (2)) |
422 (No patch available yet, too many successors (2)) |
429 |
423 |
430 Check that debugobshistory on the second successor after split show |
424 Check that debugobshistory on the second successor after split show |
431 the revision plus the splitted one |
425 the revision plus the splitted one |
432 $ hg obslog f257fde29c7a --patch |
426 $ hg obslog f257fde29c7a --patch |
433 @ f257fde29c7a (3) A0 |
427 @ f257fde29c7a (3) A0 |
434 | |
428 | |
435 x 471597cad322 (1) A0 |
429 x 471597cad322 (1) A0 |
436 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
430 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
437 (No patch available yet, too many successors (2)) |
431 (No patch available yet, too many successors (2)) |
438 |
432 |
439 With the all option, it should show the three changesets |
433 With the all option, it should show the three changesets |
440 $ hg obslog f257fde29c7a --all --patch |
434 $ hg obslog f257fde29c7a --all --patch |
441 o 337fec4d2edc (2) A0 |
435 o 337fec4d2edc (2) A0 |
442 | |
436 | |
443 | @ f257fde29c7a (3) A0 |
437 | @ f257fde29c7a (3) A0 |
444 |/ |
438 |/ |
445 x 471597cad322 (1) A0 |
439 x 471597cad322 (1) A0 |
446 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
440 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
447 (No patch available yet, too many successors (2)) |
441 (No patch available yet, too many successors (2)) |
448 |
442 |
449 Obslog with all option all should also works on the splitted commit |
443 Obslog with all option all should also works on the splitted commit |
450 $ hg obslog -a 471597cad322 --hidden --patch |
444 $ hg obslog -a 471597cad322 --hidden --patch |
451 o 337fec4d2edc (2) A0 |
445 o 337fec4d2edc (2) A0 |
452 | |
446 | |
453 | @ f257fde29c7a (3) A0 |
447 | @ f257fde29c7a (3) A0 |
454 |/ |
448 |/ |
455 x 471597cad322 (1) A0 |
449 x 471597cad322 (1) A0 |
456 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
450 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
457 (No patch available yet, too many successors (2)) |
451 (No patch available yet, too many successors (2)) |
458 |
452 |
459 Check that debugobshistory on both successors after split show |
453 Check that debugobshistory on both successors after split show |
460 a coherent graph |
454 a coherent graph |
461 $ hg obslog 'f257fde29c7a+337fec4d2edc' --patch |
455 $ hg obslog 'f257fde29c7a+337fec4d2edc' --patch |
462 o 337fec4d2edc (2) A0 |
456 o 337fec4d2edc (2) A0 |
463 | |
457 | |
464 | @ f257fde29c7a (3) A0 |
458 | @ f257fde29c7a (3) A0 |
465 |/ |
459 |/ |
466 x 471597cad322 (1) A0 |
460 x 471597cad322 (1) A0 |
467 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
461 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
468 (No patch available yet, too many successors (2)) |
462 (No patch available yet, too many successors (2)) |
469 |
463 |
470 $ hg update 471597cad322 |
464 $ hg update 471597cad322 |
471 abort: hidden revision '471597cad322'! |
465 abort: hidden revision '471597cad322'! |
472 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a) |
466 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a) |
630 Actual test |
624 Actual test |
631 ----------- |
625 ----------- |
632 |
626 |
633 $ hg obslog de7290d8b885 --hidden --patch |
627 $ hg obslog de7290d8b885 --hidden --patch |
634 x de7290d8b885 (1) A0 |
628 x de7290d8b885 (1) A0 |
635 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
629 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) |
636 (No patch available yet, too many successors (4)) |
630 (No patch available yet, too many successors (4)) |
637 |
631 |
638 $ hg obslog de7290d8b885 --hidden --all --patch |
632 $ hg obslog de7290d8b885 --hidden --all --patch |
639 o 1ae8bc733a14 (4) A0 |
633 o 1ae8bc733a14 (4) A0 |
640 | |
634 | |
643 | @ c7f044602e9b (5) A0 |
637 | @ c7f044602e9b (5) A0 |
644 |/ |
638 |/ |
645 | o f257fde29c7a (3) A0 |
639 | o f257fde29c7a (3) A0 |
646 |/ |
640 |/ |
647 x de7290d8b885 (1) A0 |
641 x de7290d8b885 (1) A0 |
648 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
642 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) |
649 (No patch available yet, too many successors (4)) |
643 (No patch available yet, too many successors (4)) |
650 |
644 |
651 $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool |
645 $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool |
652 [ |
646 [ |
653 { |
647 { |
678 ] |
672 ] |
679 $ hg obslog c7f044602e9b --patch |
673 $ hg obslog c7f044602e9b --patch |
680 @ c7f044602e9b (5) A0 |
674 @ c7f044602e9b (5) A0 |
681 | |
675 | |
682 x de7290d8b885 (1) A0 |
676 x de7290d8b885 (1) A0 |
683 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
677 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) |
684 (No patch available yet, too many successors (4)) |
678 (No patch available yet, too many successors (4)) |
685 |
679 |
686 $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool |
680 $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool |
687 [ |
681 [ |
688 { |
682 { |
726 | @ c7f044602e9b (5) A0 |
720 | @ c7f044602e9b (5) A0 |
727 |/ |
721 |/ |
728 | o f257fde29c7a (3) A0 |
722 | o f257fde29c7a (3) A0 |
729 |/ |
723 |/ |
730 x de7290d8b885 (1) A0 |
724 x de7290d8b885 (1) A0 |
731 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
725 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) |
732 (No patch available yet, too many successors (4)) |
726 (No patch available yet, too many successors (4)) |
733 |
727 |
734 $ hg obslog 5 --all --patch |
728 $ hg obslog 5 --all --patch |
735 o 1ae8bc733a14 (4) A0 |
729 o 1ae8bc733a14 (4) A0 |
736 | |
730 | |
739 | @ c7f044602e9b (5) A0 |
733 | @ c7f044602e9b (5) A0 |
740 |/ |
734 |/ |
741 | o f257fde29c7a (3) A0 |
735 | o f257fde29c7a (3) A0 |
742 |/ |
736 |/ |
743 x de7290d8b885 (1) A0 |
737 x de7290d8b885 (1) A0 |
744 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
738 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) |
745 (No patch available yet, too many successors (4)) |
739 (No patch available yet, too many successors (4)) |
746 |
740 |
747 $ hg update de7290d8b885 |
741 $ hg update de7290d8b885 |
748 abort: hidden revision 'de7290d8b885'! |
742 abort: hidden revision 'de7290d8b885'! |
749 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more) |
743 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more) |
814 |
808 |
815 Check that debugobshistory on the first folded revision show only |
809 Check that debugobshistory on the first folded revision show only |
816 the revision with the target |
810 the revision with the target |
817 $ hg obslog --hidden 471f378eab4c --patch |
811 $ hg obslog --hidden 471f378eab4c --patch |
818 x 471f378eab4c (1) A0 |
812 x 471f378eab4c (1) A0 |
819 rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) |
813 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
820 --- a/471f378eab4c-changeset-description |
814 --- a/471f378eab4c-changeset-description |
821 +++ b/eb5a0daa2192-changeset-description |
815 +++ b/eb5a0daa2192-changeset-description |
822 @@ -1,1 +1,1 @@ |
816 @@ -1,1 +1,1 @@ |
823 -A0 |
817 -A0 |
824 +C0 |
818 +C0 |
833 Check that with all option, all changesets are shown |
827 Check that with all option, all changesets are shown |
834 $ hg obslog --hidden --all 471f378eab4c --patch |
828 $ hg obslog --hidden --all 471f378eab4c --patch |
835 @ eb5a0daa2192 (3) C0 |
829 @ eb5a0daa2192 (3) C0 |
836 |\ |
830 |\ |
837 x | 0dec01379d3b (2) B0 |
831 x | 0dec01379d3b (2) B0 |
838 / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) |
832 / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
839 | (No patch available yet, changesets rebased) |
833 | (No patch available yet, changesets rebased) |
840 | |
834 | |
841 x 471f378eab4c (1) A0 |
835 x 471f378eab4c (1) A0 |
842 rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) |
836 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
843 --- a/471f378eab4c-changeset-description |
837 --- a/471f378eab4c-changeset-description |
844 +++ b/eb5a0daa2192-changeset-description |
838 +++ b/eb5a0daa2192-changeset-description |
845 @@ -1,1 +1,1 @@ |
839 @@ -1,1 +1,1 @@ |
846 -A0 |
840 -A0 |
847 +C0 |
841 +C0 |
855 |
849 |
856 Check that debugobshistory on the second folded revision show only |
850 Check that debugobshistory on the second folded revision show only |
857 the revision with the target |
851 the revision with the target |
858 $ hg obslog --hidden 0dec01379d3b --patch |
852 $ hg obslog --hidden 0dec01379d3b --patch |
859 x 0dec01379d3b (2) B0 |
853 x 0dec01379d3b (2) B0 |
860 rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) |
854 rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
861 (No patch available yet, changesets rebased) |
855 (No patch available yet, changesets rebased) |
862 |
856 |
863 Check that with all option, all changesets are shown |
857 Check that with all option, all changesets are shown |
864 $ hg obslog --hidden --all 0dec01379d3b --patch |
858 $ hg obslog --hidden --all 0dec01379d3b --patch |
865 @ eb5a0daa2192 (3) C0 |
859 @ eb5a0daa2192 (3) C0 |
866 |\ |
860 |\ |
867 x | 0dec01379d3b (2) B0 |
861 x | 0dec01379d3b (2) B0 |
868 / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) |
862 / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
869 | (No patch available yet, changesets rebased) |
863 | (No patch available yet, changesets rebased) |
870 | |
864 | |
871 x 471f378eab4c (1) A0 |
865 x 471f378eab4c (1) A0 |
872 rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) |
866 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
873 --- a/471f378eab4c-changeset-description |
867 --- a/471f378eab4c-changeset-description |
874 +++ b/eb5a0daa2192-changeset-description |
868 +++ b/eb5a0daa2192-changeset-description |
875 @@ -1,1 +1,1 @@ |
869 @@ -1,1 +1,1 @@ |
876 -A0 |
870 -A0 |
877 +C0 |
871 +C0 |
887 graph |
881 graph |
888 $ hg obslog eb5a0daa2192 --patch |
882 $ hg obslog eb5a0daa2192 --patch |
889 @ eb5a0daa2192 (3) C0 |
883 @ eb5a0daa2192 (3) C0 |
890 |\ |
884 |\ |
891 x | 0dec01379d3b (2) B0 |
885 x | 0dec01379d3b (2) B0 |
892 / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) |
886 / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
893 | (No patch available yet, changesets rebased) |
887 | (No patch available yet, changesets rebased) |
894 | |
888 | |
895 x 471f378eab4c (1) A0 |
889 x 471f378eab4c (1) A0 |
896 rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) |
890 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
897 --- a/471f378eab4c-changeset-description |
891 --- a/471f378eab4c-changeset-description |
898 +++ b/eb5a0daa2192-changeset-description |
892 +++ b/eb5a0daa2192-changeset-description |
899 @@ -1,1 +1,1 @@ |
893 @@ -1,1 +1,1 @@ |
900 -A0 |
894 -A0 |
901 +C0 |
895 +C0 |
921 "date": [ |
915 "date": [ |
922 *, (glob) |
916 *, (glob) |
923 0 (glob) |
917 0 (glob) |
924 ], |
918 ], |
925 "effect": [ |
919 "effect": [ |
926 *, (glob) |
920 "description", |
927 "content" |
921 "content" |
928 ], |
922 ], |
929 "succnodes": [ |
923 "succnodes": [ |
930 "eb5a0daa2192" |
924 "eb5a0daa2192" |
931 ], |
925 ], |
939 }, |
933 }, |
940 { |
934 { |
941 "markers": [ |
935 "markers": [ |
942 { |
936 { |
943 "date": [ |
937 "date": [ |
944 0.0, |
938 *, (glob) |
945 0 (glob) |
939 0 (glob) |
946 ], |
940 ], |
947 "effect": [ |
941 "effect": [ |
948 "description", |
942 "description", |
949 "parent", |
943 "parent", |
1013 $ hg update --hidden 'desc(A0)' |
1007 $ hg update --hidden 'desc(A0)' |
1014 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1008 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1015 working directory parent is obsolete! (471f378eab4c) |
1009 working directory parent is obsolete! (471f378eab4c) |
1016 (use 'hg evolve' to update to its successor: fdf9bde5129a) |
1010 (use 'hg evolve' to update to its successor: fdf9bde5129a) |
1017 $ hg amend -m "A2" |
1011 $ hg amend -m "A2" |
1018 2 new divergent changesets |
1012 2 new content-divergent changesets |
1019 $ hg log --hidden -G |
1013 $ hg log --hidden -G |
1020 @ changeset: 3:65b757b745b9 |
1014 @ changeset: 3:65b757b745b9 |
1021 | tag: tip |
1015 | tag: tip |
1022 | parent: 0:ea207398892e |
1016 | parent: 0:ea207398892e |
1023 | user: test |
1017 | user: test |
1024 | date: Thu Jan 01 00:00:00 1970 +0000 |
1018 | date: Thu Jan 01 00:00:00 1970 +0000 |
1025 | trouble: divergent |
1019 | instability: content-divergent |
1026 | summary: A2 |
1020 | summary: A2 |
1027 | |
1021 | |
1028 | o changeset: 2:fdf9bde5129a |
1022 | o changeset: 2:fdf9bde5129a |
1029 |/ parent: 0:ea207398892e |
1023 |/ parent: 0:ea207398892e |
1030 | user: test |
1024 | user: test |
1031 | date: Thu Jan 01 00:00:00 1970 +0000 |
1025 | date: Thu Jan 01 00:00:00 1970 +0000 |
1032 | trouble: divergent |
1026 | instability: content-divergent |
1033 | summary: A1 |
1027 | summary: A1 |
1034 | |
1028 | |
1035 | x changeset: 1:471f378eab4c |
1029 | x changeset: 1:471f378eab4c |
1036 |/ user: test |
1030 |/ user: test |
1037 | date: Thu Jan 01 00:00:00 1970 +0000 |
1031 | date: Thu Jan 01 00:00:00 1970 +0000 |
1048 ----------- |
1042 ----------- |
1049 |
1043 |
1050 Check that debugobshistory on the divergent revision show both destinations |
1044 Check that debugobshistory on the divergent revision show both destinations |
1051 $ hg obslog --hidden 471f378eab4c --patch |
1045 $ hg obslog --hidden 471f378eab4c --patch |
1052 x 471f378eab4c (1) A0 |
1046 x 471f378eab4c (1) A0 |
1053 rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000) |
1047 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1054 --- a/471f378eab4c-changeset-description |
1048 --- a/471f378eab4c-changeset-description |
1055 +++ b/65b757b745b9-changeset-description |
1049 +++ b/65b757b745b9-changeset-description |
1056 @@ -1,1 +1,1 @@ |
1050 @@ -1,1 +1,1 @@ |
1057 -A0 |
1051 -A0 |
1058 +A2 |
1052 +A2 |
1059 |
1053 |
1060 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) |
1054 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1061 --- a/471f378eab4c-changeset-description |
1055 --- a/471f378eab4c-changeset-description |
1062 +++ b/fdf9bde5129a-changeset-description |
1056 +++ b/fdf9bde5129a-changeset-description |
1063 @@ -1,1 +1,1 @@ |
1057 @@ -1,1 +1,1 @@ |
1064 -A0 |
1058 -A0 |
1065 +A1 |
1059 +A1 |
1071 @ 65b757b745b9 (3) A2 |
1065 @ 65b757b745b9 (3) A2 |
1072 | |
1066 | |
1073 | o fdf9bde5129a (2) A1 |
1067 | o fdf9bde5129a (2) A1 |
1074 |/ |
1068 |/ |
1075 x 471f378eab4c (1) A0 |
1069 x 471f378eab4c (1) A0 |
1076 rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000) |
1070 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1077 --- a/471f378eab4c-changeset-description |
1071 --- a/471f378eab4c-changeset-description |
1078 +++ b/65b757b745b9-changeset-description |
1072 +++ b/65b757b745b9-changeset-description |
1079 @@ -1,1 +1,1 @@ |
1073 @@ -1,1 +1,1 @@ |
1080 -A0 |
1074 -A0 |
1081 +A2 |
1075 +A2 |
1082 |
1076 |
1083 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) |
1077 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1084 --- a/471f378eab4c-changeset-description |
1078 --- a/471f378eab4c-changeset-description |
1085 +++ b/fdf9bde5129a-changeset-description |
1079 +++ b/fdf9bde5129a-changeset-description |
1086 @@ -1,1 +1,1 @@ |
1080 @@ -1,1 +1,1 @@ |
1087 -A0 |
1081 -A0 |
1088 +A1 |
1082 +A1 |
1130 and the diverent one |
1124 and the diverent one |
1131 $ hg obslog fdf9bde5129a --patch |
1125 $ hg obslog fdf9bde5129a --patch |
1132 o fdf9bde5129a (2) A1 |
1126 o fdf9bde5129a (2) A1 |
1133 | |
1127 | |
1134 x 471f378eab4c (1) A0 |
1128 x 471f378eab4c (1) A0 |
1135 rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000) |
1129 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1136 --- a/471f378eab4c-changeset-description |
1130 --- a/471f378eab4c-changeset-description |
1137 +++ b/65b757b745b9-changeset-description |
1131 +++ b/65b757b745b9-changeset-description |
1138 @@ -1,1 +1,1 @@ |
1132 @@ -1,1 +1,1 @@ |
1139 -A0 |
1133 -A0 |
1140 +A2 |
1134 +A2 |
1141 |
1135 |
1142 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) |
1136 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1143 --- a/471f378eab4c-changeset-description |
1137 --- a/471f378eab4c-changeset-description |
1144 +++ b/fdf9bde5129a-changeset-description |
1138 +++ b/fdf9bde5129a-changeset-description |
1145 @@ -1,1 +1,1 @@ |
1139 @@ -1,1 +1,1 @@ |
1146 -A0 |
1140 -A0 |
1147 +A1 |
1141 +A1 |
1153 @ 65b757b745b9 (3) A2 |
1147 @ 65b757b745b9 (3) A2 |
1154 | |
1148 | |
1155 | o fdf9bde5129a (2) A1 |
1149 | o fdf9bde5129a (2) A1 |
1156 |/ |
1150 |/ |
1157 x 471f378eab4c (1) A0 |
1151 x 471f378eab4c (1) A0 |
1158 rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000) |
1152 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1159 --- a/471f378eab4c-changeset-description |
1153 --- a/471f378eab4c-changeset-description |
1160 +++ b/65b757b745b9-changeset-description |
1154 +++ b/65b757b745b9-changeset-description |
1161 @@ -1,1 +1,1 @@ |
1155 @@ -1,1 +1,1 @@ |
1162 -A0 |
1156 -A0 |
1163 +A2 |
1157 +A2 |
1164 |
1158 |
1165 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) |
1159 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1166 --- a/471f378eab4c-changeset-description |
1160 --- a/471f378eab4c-changeset-description |
1167 +++ b/fdf9bde5129a-changeset-description |
1161 +++ b/fdf9bde5129a-changeset-description |
1168 @@ -1,1 +1,1 @@ |
1162 @@ -1,1 +1,1 @@ |
1169 -A0 |
1163 -A0 |
1170 +A1 |
1164 +A1 |
1174 and the diverent one |
1168 and the diverent one |
1175 $ hg obslog 65b757b745b9 --patch |
1169 $ hg obslog 65b757b745b9 --patch |
1176 @ 65b757b745b9 (3) A2 |
1170 @ 65b757b745b9 (3) A2 |
1177 | |
1171 | |
1178 x 471f378eab4c (1) A0 |
1172 x 471f378eab4c (1) A0 |
1179 rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000) |
1173 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1180 --- a/471f378eab4c-changeset-description |
1174 --- a/471f378eab4c-changeset-description |
1181 +++ b/65b757b745b9-changeset-description |
1175 +++ b/65b757b745b9-changeset-description |
1182 @@ -1,1 +1,1 @@ |
1176 @@ -1,1 +1,1 @@ |
1183 -A0 |
1177 -A0 |
1184 +A2 |
1178 +A2 |
1185 |
1179 |
1186 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) |
1180 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1187 --- a/471f378eab4c-changeset-description |
1181 --- a/471f378eab4c-changeset-description |
1188 +++ b/fdf9bde5129a-changeset-description |
1182 +++ b/fdf9bde5129a-changeset-description |
1189 @@ -1,1 +1,1 @@ |
1183 @@ -1,1 +1,1 @@ |
1190 -A0 |
1184 -A0 |
1191 +A1 |
1185 +A1 |
1196 @ 65b757b745b9 (3) A2 |
1190 @ 65b757b745b9 (3) A2 |
1197 | |
1191 | |
1198 | o fdf9bde5129a (2) A1 |
1192 | o fdf9bde5129a (2) A1 |
1199 |/ |
1193 |/ |
1200 x 471f378eab4c (1) A0 |
1194 x 471f378eab4c (1) A0 |
1201 rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000) |
1195 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1202 --- a/471f378eab4c-changeset-description |
1196 --- a/471f378eab4c-changeset-description |
1203 +++ b/65b757b745b9-changeset-description |
1197 +++ b/65b757b745b9-changeset-description |
1204 @@ -1,1 +1,1 @@ |
1198 @@ -1,1 +1,1 @@ |
1205 -A0 |
1199 -A0 |
1206 +A2 |
1200 +A2 |
1207 |
1201 |
1208 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) |
1202 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1209 --- a/471f378eab4c-changeset-description |
1203 --- a/471f378eab4c-changeset-description |
1210 +++ b/fdf9bde5129a-changeset-description |
1204 +++ b/fdf9bde5129a-changeset-description |
1211 @@ -1,1 +1,1 @@ |
1205 @@ -1,1 +1,1 @@ |
1212 -A0 |
1206 -A0 |
1213 +A1 |
1207 +A1 |
1219 @ 65b757b745b9 (3) A2 |
1213 @ 65b757b745b9 (3) A2 |
1220 | |
1214 | |
1221 | o fdf9bde5129a (2) A1 |
1215 | o fdf9bde5129a (2) A1 |
1222 |/ |
1216 |/ |
1223 x 471f378eab4c (1) A0 |
1217 x 471f378eab4c (1) A0 |
1224 rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000) |
1218 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1225 --- a/471f378eab4c-changeset-description |
1219 --- a/471f378eab4c-changeset-description |
1226 +++ b/65b757b745b9-changeset-description |
1220 +++ b/65b757b745b9-changeset-description |
1227 @@ -1,1 +1,1 @@ |
1221 @@ -1,1 +1,1 @@ |
1228 -A0 |
1222 -A0 |
1229 +A2 |
1223 +A2 |
1230 |
1224 |
1231 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) |
1225 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1232 --- a/471f378eab4c-changeset-description |
1226 --- a/471f378eab4c-changeset-description |
1233 +++ b/fdf9bde5129a-changeset-description |
1227 +++ b/fdf9bde5129a-changeset-description |
1234 @@ -1,1 +1,1 @@ |
1228 @@ -1,1 +1,1 @@ |
1235 -A0 |
1229 -A0 |
1236 +A1 |
1230 +A1 |
1372 Check that debugobshistory on head show a coherent graph |
1366 Check that debugobshistory on head show a coherent graph |
1373 $ hg obslog eb5a0daa2192 --patch |
1367 $ hg obslog eb5a0daa2192 --patch |
1374 @ eb5a0daa2192 (4) C0 |
1368 @ eb5a0daa2192 (4) C0 |
1375 |\ |
1369 |\ |
1376 x | 471f378eab4c (1) A0 |
1370 x | 471f378eab4c (1) A0 |
1377 / rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) |
1371 / rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
1378 | --- a/471f378eab4c-changeset-description |
1372 | --- a/471f378eab4c-changeset-description |
1379 | +++ b/eb5a0daa2192-changeset-description |
1373 | +++ b/eb5a0daa2192-changeset-description |
1380 | @@ -1,1 +1,1 @@ |
1374 | @@ -1,1 +1,1 @@ |
1381 | -A0 |
1375 | -A0 |
1382 | +C0 |
1376 | +C0 |
1387 | @@ -0,0 +1,1 @@ |
1381 | @@ -0,0 +1,1 @@ |
1388 | +B0 |
1382 | +B0 |
1389 | |
1383 | |
1390 | |
1384 | |
1391 x b7ea6d14e664 (3) B1 |
1385 x b7ea6d14e664 (3) B1 |
1392 | rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) |
1386 | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
1393 | (No patch available yet, changesets rebased) |
1387 | (No patch available yet, changesets rebased) |
1394 | |
1388 | |
1395 x 0dec01379d3b (2) B0 |
1389 x 0dec01379d3b (2) B0 |
1396 rewritten(description) as b7ea6d14e664 by test (Thu Jan 01 00:00:00 1970 +0000) |
1390 rewritten(description) as b7ea6d14e664 by test (*) (glob) |
1397 --- a/0dec01379d3b-changeset-description |
1391 --- a/0dec01379d3b-changeset-description |
1398 +++ b/b7ea6d14e664-changeset-description |
1392 +++ b/b7ea6d14e664-changeset-description |
1399 @@ -1,1 +1,1 @@ |
1393 @@ -1,1 +1,1 @@ |
1400 -B0 |
1394 -B0 |
1401 +B1 |
1395 +B1 |
1404 Check that obslog on ROOT with all option show everything |
1398 Check that obslog on ROOT with all option show everything |
1405 $ hg obslog 1 --hidden --all --patch |
1399 $ hg obslog 1 --hidden --all --patch |
1406 @ eb5a0daa2192 (4) C0 |
1400 @ eb5a0daa2192 (4) C0 |
1407 |\ |
1401 |\ |
1408 x | 471f378eab4c (1) A0 |
1402 x | 471f378eab4c (1) A0 |
1409 / rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) |
1403 / rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
1410 | --- a/471f378eab4c-changeset-description |
1404 | --- a/471f378eab4c-changeset-description |
1411 | +++ b/eb5a0daa2192-changeset-description |
1405 | +++ b/eb5a0daa2192-changeset-description |
1412 | @@ -1,1 +1,1 @@ |
1406 | @@ -1,1 +1,1 @@ |
1413 | -A0 |
1407 | -A0 |
1414 | +C0 |
1408 | +C0 |
1419 | @@ -0,0 +1,1 @@ |
1413 | @@ -0,0 +1,1 @@ |
1420 | +B0 |
1414 | +B0 |
1421 | |
1415 | |
1422 | |
1416 | |
1423 x b7ea6d14e664 (3) B1 |
1417 x b7ea6d14e664 (3) B1 |
1424 | rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) |
1418 | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
1425 | (No patch available yet, changesets rebased) |
1419 | (No patch available yet, changesets rebased) |
1426 | |
1420 | |
1427 x 0dec01379d3b (2) B0 |
1421 x 0dec01379d3b (2) B0 |
1428 rewritten(description) as b7ea6d14e664 by test (Thu Jan 01 00:00:00 1970 +0000) |
1422 rewritten(description) as b7ea6d14e664 by test (*) (glob) |
1429 --- a/0dec01379d3b-changeset-description |
1423 --- a/0dec01379d3b-changeset-description |
1430 +++ b/b7ea6d14e664-changeset-description |
1424 +++ b/b7ea6d14e664-changeset-description |
1431 @@ -1,1 +1,1 @@ |
1425 @@ -1,1 +1,1 @@ |
1432 -B0 |
1426 -B0 |
1433 +B1 |
1427 +B1 |
1601 |
1595 |
1602 $ hg obslog 7a230b46bf61 --patch |
1596 $ hg obslog 7a230b46bf61 --patch |
1603 @ 7a230b46bf61 (3) A2 |
1597 @ 7a230b46bf61 (3) A2 |
1604 | |
1598 | |
1605 x fdf9bde5129a (2) A1 |
1599 x fdf9bde5129a (2) A1 |
1606 | rewritten(description) as 7a230b46bf61 by test (Thu Jan 01 00:00:00 1970 +0000) |
1600 | rewritten(description) as 7a230b46bf61 by test (*) (glob) |
1607 | --- a/fdf9bde5129a-changeset-description |
1601 | --- a/fdf9bde5129a-changeset-description |
1608 | +++ b/7a230b46bf61-changeset-description |
1602 | +++ b/7a230b46bf61-changeset-description |
1609 | @@ -1,1 +1,1 @@ |
1603 | @@ -1,1 +1,1 @@ |
1610 | -A1 |
1604 | -A1 |
1611 | +A2 |
1605 | +A2 |
1612 | |
1606 | |
1613 | |
1607 | |
1614 x 471f378eab4c (1) A0 |
1608 x 471f378eab4c (1) A0 |
1615 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) |
1609 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1616 --- a/471f378eab4c-changeset-description |
1610 --- a/471f378eab4c-changeset-description |
1617 +++ b/fdf9bde5129a-changeset-description |
1611 +++ b/fdf9bde5129a-changeset-description |
1618 @@ -1,1 +1,1 @@ |
1612 @@ -1,1 +1,1 @@ |
1619 -A0 |
1613 -A0 |
1620 +A1 |
1614 +A1 |
1637 changectx |
1631 changectx |
1638 $ hg obslog 7a230b46bf61 --patch |
1632 $ hg obslog 7a230b46bf61 --patch |
1639 o 7a230b46bf61 (2) A2 |
1633 o 7a230b46bf61 (2) A2 |
1640 | |
1634 | |
1641 x fdf9bde5129a |
1635 x fdf9bde5129a |
1642 | rewritten(description) as 7a230b46bf61 by test (Thu Jan 01 00:00:00 1970 +0000) |
1636 | rewritten(description) as 7a230b46bf61 by test (*) (glob) |
1643 | (No patch available yet, context is not local) |
1637 | (No patch available yet, context is not local) |
1644 | |
1638 | |
1645 @ 471f378eab4c (1) A0 |
1639 @ 471f378eab4c (1) A0 |
1646 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) |
1640 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1647 (No patch available yet, succ is unknown locally) |
1641 (No patch available yet, succ is unknown locally) |
1648 |
1642 |
1649 $ hg obslog 7a230b46bf61 --color=debug --patch |
1643 $ hg obslog 7a230b46bf61 --color=debug --patch |
1650 o [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2] |
1644 o [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2] |
1651 | |
1645 | |
1652 x [evolve.node evolve.missing_change_ctx|fdf9bde5129a] |
1646 x [evolve.node evolve.missing_change_ctx|fdf9bde5129a] |
1653 | [evolve.verb|rewritten](description) as [evolve.node|7a230b46bf61] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)] |
1647 | [evolve.verb|rewritten](description) as [evolve.node|7a230b46bf61] by [evolve.user|test] [evolve.date|(*)] (glob) |
1654 | (No patch available yet, context is not local) |
1648 | (No patch available yet, context is not local) |
1655 | |
1649 | |
1656 @ [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] |
1650 @ [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] |
1657 [evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)] |
1651 [evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] by [evolve.user|test] [evolve.date|(*)] (glob) |
1658 (No patch available yet, succ is unknown locally) |
1652 (No patch available yet, succ is unknown locally) |
1659 |
1653 |