534 |
534 |
535 $ html_output $TESTDIR/output/amend-obslog-after.log obslog -G -r "typo" |
535 $ html_output $TESTDIR/output/amend-obslog-after.log obslog -G -r "typo" |
536 @ <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug |
536 @ <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug |
537 | |
537 | |
538 x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug |
538 x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug |
539 rewritten(description) as <span style="color:olive;">708369dc1bfe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
539 rewritten(description) as <span style="color:olive;">708369dc1bfe</span> using <span style="font-weight:bold;">amend</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
540 |
540 |
541 $ html_output $TESTDIR/output/amend-obslog-patch-after.log obslog -G -r "typo" --patch |
541 $ html_output $TESTDIR/output/amend-obslog-patch-after.log obslog -G -r "typo" --patch |
542 @ <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug |
542 @ <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug |
543 | |
543 | |
544 x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug |
544 x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug |
545 rewritten(description) as <span style="color:olive;">708369dc1bfe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
545 rewritten(description) as <span style="color:olive;">708369dc1bfe</span> using <span style="font-weight:bold;">amend</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
546 --- a/5d48a444aba7-changeset-description |
546 <span style="font-weight:bold;">diff -r 5d48a444aba7 -r 708369dc1bfe changeset-description</span> |
547 +++ b/708369dc1bfe-changeset-description |
547 <span style="font-weight:bold;color:red;">--- a/changeset-description</span> |
548 @@ -1,1 +1,1 @@ |
548 <span style="font-weight:bold;color:green;">+++ b/changeset-description</span> |
549 -Fx bug |
549 <span style="color:purple;">@@ -1,1 +1,1 @@</span> |
550 +Fix bug |
550 <span style="color:red;">-Fx bug</span> |
|
551 <span style="color:green;">+Fix bug</span> |
551 |
552 |
552 |
553 |
553 $ html_output $TESTDIR/output/amend-obslog-all-after.log obslog --all -G -r "predecessors(typo)" --hidden |
554 $ html_output $TESTDIR/output/amend-obslog-all-after.log obslog --all -G -r "predecessors(typo)" --hidden |
554 @ <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug |
555 @ <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug |
555 | |
556 | |
556 x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug |
557 x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug |
557 rewritten(description) as <span style="color:olive;">708369dc1bfe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
558 rewritten(description) as <span style="color:olive;">708369dc1bfe</span> using <span style="font-weight:bold;">amend</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
558 |
559 |
559 |
560 |
560 Rebase |
561 Rebase |
561 ------ |
562 ------ |
562 |
563 |
791 |
792 |
792 $ html_output $TESTDIR/output/rebase-obslog-after.log obslog -r "build/linuxsupport-v2" |
793 $ html_output $TESTDIR/output/rebase-obslog-after.log obslog -r "build/linuxsupport-v2" |
793 @ <span style="color:olive;">3d2c8a2356a2</span> <span style="color:blue;">(20)</span> Third commit on build/linuxsupport-v2 |
794 @ <span style="color:olive;">3d2c8a2356a2</span> <span style="color:blue;">(20)</span> Third commit on build/linuxsupport-v2 |
794 | |
795 | |
795 x <span style="color:olive;">39e9774ab30b</span> <span style="color:blue;">(5)</span> Third commit on build/linuxsupport-v2 |
796 x <span style="color:olive;">39e9774ab30b</span> <span style="color:blue;">(5)</span> Third commit on build/linuxsupport-v2 |
796 rewritten(parent) as <span style="color:olive;">3d2c8a2356a2</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
797 rewritten(parent) as <span style="color:olive;">3d2c8a2356a2</span> using <span style="font-weight:bold;">rebase</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
797 |
798 |
798 $ graph $TESTDIR/graphs/rebase-after.dot -r '::desc(v2)' -T "{shortest(node, 8)}" --public=yes |
799 $ graph $TESTDIR/graphs/rebase-after.dot -r '::desc(v2)' -T "{shortest(node, 8)}" --public=yes |
799 Wrote */graphs/rebase-after.dot (glob) |
800 Wrote */graphs/rebase-after.dot (glob) |
800 .. graphviz:: |
801 .. graphviz:: |
801 |
802 |
802 strict digraph "Mercurial graph" { |
803 strict digraph "Mercurial graph" { |
803 graph [rankdir=LR, |
804 graph [rankdir=LR, |
804 splines=polyline |
805 splines=polyline |
805 ]; |
806 ]; |
806 node [label="\N"]; |
807 node [label="\N"]; |
807 0 [fillcolor="#7F7FFF", |
808 0 [fillcolor="#7F7FFF", |
808 fixedsize=true, |
809 fixedsize=true, |
809 group=default, |
810 group=default, |
810 height=1, |
811 height=1, |
811 label=d2eb2ac6, |
812 label=d2eb2ac6, |
812 pin=true, |
813 pin=true, |
813 pos="1,0!", |
814 pos="1,0!", |
814 shape=circle, |
815 shape=circle, |
815 style=filled, |
816 style=filled, |
816 width=1]; |
817 width=1]; |
817 2 [fillcolor="#7F7FFF", |
818 2 [fillcolor="#7F7FFF", |
818 fixedsize=true, |
819 fixedsize=true, |
819 group="build/v2", |
820 group="build/v2", |
820 height=1, |
821 height=1, |
821 label=f3bd0ab4, |
822 label=f3bd0ab4, |
822 pin=true, |
823 pin=true, |
823 pos="2,2!", |
824 pos="2,2!", |
824 shape=circle, |
825 shape=circle, |
825 style=filled, |
826 style=filled, |
826 width=1]; |
827 width=1]; |
827 0 -> 2 [penwidth=2.0]; |
828 0 -> 2 [penwidth=2.0]; |
828 6 [fillcolor="#7F7FFF", |
829 6 [fillcolor="#7F7FFF", |
829 fixedsize=true, |
830 fixedsize=true, |
830 group="build/v2", |
831 group="build/v2", |
831 height=1, |
832 height=1, |
832 label="0e694460", |
833 label="0e694460", |
833 pin=true, |
834 pin=true, |
834 pos="2,6!", |
835 pos="2,6!", |
835 shape=circle, |
836 shape=circle, |
836 style=filled, |
837 style=filled, |
837 width=1]; |
838 width=1]; |
838 2 -> 6 [penwidth=2.0]; |
839 2 -> 6 [penwidth=2.0]; |
839 18 [fillcolor="#7F7FFF", |
840 18 [fillcolor="#7F7FFF", |
840 fixedsize=true, |
841 fixedsize=true, |
841 group="build/linuxsupport-v2", |
842 group="build/linuxsupport-v2", |
842 height=1, |
843 height=1, |
843 label="7b62ce2c", |
844 label="7b62ce2c", |
844 pin=true, |
845 pin=true, |
845 pos="3,18!", |
846 pos="3,18!", |
846 shape=circle, |
847 shape=circle, |
847 style=filled, |
848 style=filled, |
848 width=1]; |
849 width=1]; |
849 6 -> 18 [penwidth=2.0]; |
850 6 -> 18 [penwidth=2.0]; |
850 19 [fillcolor="#7F7FFF", |
851 19 [fillcolor="#7F7FFF", |
851 fixedsize=true, |
852 fixedsize=true, |
852 group="build/linuxsupport-v2", |
853 group="build/linuxsupport-v2", |
853 height=1, |
854 height=1, |
854 label=46863783, |
855 label=46863783, |
855 pin=true, |
856 pin=true, |
856 pos="3,19!", |
857 pos="3,19!", |
857 shape=circle, |
858 shape=circle, |
858 style=filled, |
859 style=filled, |
859 width=1]; |
860 width=1]; |
860 18 -> 19 [penwidth=2.0]; |
861 18 -> 19 [penwidth=2.0]; |
861 20 [fillcolor="#7F7FFF", |
862 20 [fillcolor="#7F7FFF", |
862 fixedsize=true, |
863 fixedsize=true, |
863 group="build/linuxsupport-v2", |
864 group="build/linuxsupport-v2", |
864 height=1, |
865 height=1, |
865 label="3d2c8a23", |
866 label="3d2c8a23", |
866 pin=true, |
867 pin=true, |
867 pos="3,20!", |
868 pos="3,20!", |
868 shape=circle, |
869 shape=circle, |
869 style=filled, |
870 style=filled, |
870 width=1]; |
871 width=1]; |
871 19 -> 20 [penwidth=2.0]; |
872 19 -> 20 [penwidth=2.0]; |
872 } |
873 } |
873 |
874 |
874 $ graph $TESTDIR/graphs/rebase-after-hidden.dot -r '::desc(v2)' -T "{shortest(node, 8)}" --hidden --public=yes |
875 $ graph $TESTDIR/graphs/rebase-after-hidden.dot -r '::desc(v2)' -T "{shortest(node, 8)}" --hidden --public=yes |
875 Wrote */graphs/rebase-after-hidden.dot (glob) |
876 Wrote */graphs/rebase-after-hidden.dot (glob) |
876 .. graphviz:: |
877 .. graphviz:: |
878 strict digraph "Mercurial graph" { |
879 strict digraph "Mercurial graph" { |
879 graph [rankdir=LR, |
880 graph [rankdir=LR, |
880 splines=polyline |
881 splines=polyline |
881 ]; |
882 ]; |
882 node [label="\N"]; |
883 node [label="\N"]; |
883 0 [fillcolor="#7F7FFF", |
884 0 [fillcolor="#7F7FFF", |
884 fixedsize=true, |
885 fixedsize=true, |
885 group=default, |
886 group=default, |
886 height=1, |
887 height=1, |
887 label=d2eb2ac6, |
888 label=d2eb2ac6, |
888 pin=true, |
889 pin=true, |
889 pos="1,0!", |
890 pos="1,0!", |
890 shape=circle, |
891 shape=circle, |
891 style=filled, |
892 style=filled, |
892 width=1]; |
893 width=1]; |
893 2 [fillcolor="#7F7FFF", |
894 2 [fillcolor="#7F7FFF", |
894 fixedsize=true, |
895 fixedsize=true, |
895 group="build/v2", |
896 group="build/v2", |
896 height=1, |
897 height=1, |
897 label=f3bd0ab4, |
898 label=f3bd0ab4, |
898 pin=true, |
899 pin=true, |
899 pos="2,2!", |
900 pos="2,2!", |
900 shape=circle, |
901 shape=circle, |
901 style=filled, |
902 style=filled, |
902 width=1]; |
903 width=1]; |
903 0 -> 2 [penwidth=2.0]; |
904 0 -> 2 [penwidth=2.0]; |
904 3 [fillcolor="#DFDFFF", |
905 3 [fillcolor="#DFDFFF", |
905 fixedsize=true, |
906 fixedsize=true, |
906 group="build/linuxsupport-v2_extinct", |
907 group="build/linuxsupport-v2_extinct", |
907 height=1, |
908 height=1, |
908 label="424916b6", |
909 label="424916b6", |
909 pin=true, |
910 pin=true, |
910 pos="3,3!", |
911 pos="3,3!", |
911 shape=circle, |
912 shape=circle, |
912 style="dotted, filled", |
913 style="dotted, filled", |
913 width=1]; |
914 width=1]; |
914 2 -> 3 [penwidth=2.0]; |
915 2 -> 3 [penwidth=2.0]; |
915 6 [fillcolor="#7F7FFF", |
916 6 [fillcolor="#7F7FFF", |
916 fixedsize=true, |
917 fixedsize=true, |
917 group="build/v2", |
918 group="build/v2", |
918 height=1, |
919 height=1, |
919 label="0e694460", |
920 label="0e694460", |
920 pin=true, |
921 pin=true, |
921 pos="2,6!", |
922 pos="2,6!", |
922 shape=circle, |
923 shape=circle, |
923 style=filled, |
924 style=filled, |
924 width=1]; |
925 width=1]; |
925 2 -> 6 [penwidth=2.0]; |
926 2 -> 6 [penwidth=2.0]; |
926 18 [fillcolor="#7F7FFF", |
927 18 [fillcolor="#7F7FFF", |
927 fixedsize=true, |
928 fixedsize=true, |
928 group="build/linuxsupport-v2", |
929 group="build/linuxsupport-v2", |
929 height=1, |
930 height=1, |
930 label="7b62ce2c", |
931 label="7b62ce2c", |
931 pin=true, |
932 pin=true, |
932 pos="4,18!", |
933 pos="4,18!", |
933 shape=circle, |
934 shape=circle, |
934 style=filled, |
935 style=filled, |
935 width=1]; |
936 width=1]; |
936 3 -> 18 [arrowtail=dot, |
937 3 -> 18 [arrowtail=dot, |
937 dir=back, |
938 dir=back, |
938 minlen=0, |
939 minlen=0, |
939 penwidth=2.0, |
940 penwidth=2.0, |
940 style=dashed]; |
941 style=dashed]; |
941 4 [fillcolor="#DFDFFF", |
942 4 [fillcolor="#DFDFFF", |
942 fixedsize=true, |
943 fixedsize=true, |
943 group="build/linuxsupport-v2_extinct", |
944 group="build/linuxsupport-v2_extinct", |
944 height=1, |
945 height=1, |
945 label="5ad93176", |
946 label="5ad93176", |
946 pin=true, |
947 pin=true, |
947 pos="3,4!", |
948 pos="3,4!", |
948 shape=circle, |
949 shape=circle, |
949 style="dotted, filled", |
950 style="dotted, filled", |
950 width=1]; |
951 width=1]; |
951 3 -> 4 [penwidth=2.0]; |
952 3 -> 4 [penwidth=2.0]; |
952 19 [fillcolor="#7F7FFF", |
953 19 [fillcolor="#7F7FFF", |
953 fixedsize=true, |
954 fixedsize=true, |
954 group="build/linuxsupport-v2", |
955 group="build/linuxsupport-v2", |
955 height=1, |
956 height=1, |
956 label=46863783, |
957 label=46863783, |
957 pin=true, |
958 pin=true, |
958 pos="4,19!", |
959 pos="4,19!", |
959 shape=circle, |
960 shape=circle, |
960 style=filled, |
961 style=filled, |
961 width=1]; |
962 width=1]; |
962 18 -> 19 [penwidth=2.0]; |
963 18 -> 19 [penwidth=2.0]; |
963 4 -> 19 [arrowtail=dot, |
964 4 -> 19 [arrowtail=dot, |
964 dir=back, |
965 dir=back, |
965 minlen=0, |
966 minlen=0, |
966 penwidth=2.0, |
967 penwidth=2.0, |
967 style=dashed]; |
968 style=dashed]; |
968 5 [fillcolor="#DFDFFF", |
969 5 [fillcolor="#DFDFFF", |
969 fixedsize=true, |
970 fixedsize=true, |
970 group="build/linuxsupport-v2_extinct", |
971 group="build/linuxsupport-v2_extinct", |
971 height=1, |
972 height=1, |
972 label="39e9774a", |
973 label="39e9774a", |
973 pin=true, |
974 pin=true, |
974 pos="3,5!", |
975 pos="3,5!", |
975 shape=circle, |
976 shape=circle, |
976 style="dotted, filled", |
977 style="dotted, filled", |
977 width=1]; |
978 width=1]; |
978 4 -> 5 [penwidth=2.0]; |
979 4 -> 5 [penwidth=2.0]; |
979 20 [fillcolor="#7F7FFF", |
980 20 [fillcolor="#7F7FFF", |
980 fixedsize=true, |
981 fixedsize=true, |
981 group="build/linuxsupport-v2", |
982 group="build/linuxsupport-v2", |
982 height=1, |
983 height=1, |
983 label="3d2c8a23", |
984 label="3d2c8a23", |
984 pin=true, |
985 pin=true, |
985 pos="4,20!", |
986 pos="4,20!", |
986 shape=circle, |
987 shape=circle, |
987 style=filled, |
988 style=filled, |
988 width=1]; |
989 width=1]; |
989 19 -> 20 [penwidth=2.0]; |
990 19 -> 20 [penwidth=2.0]; |
990 5 -> 20 [arrowtail=dot, |
991 5 -> 20 [arrowtail=dot, |
991 dir=back, |
992 dir=back, |
992 minlen=0, |
993 minlen=0, |
993 penwidth=2.0, |
994 penwidth=2.0, |
994 style=dashed]; |
995 style=dashed]; |
995 6 -> 18 [penwidth=2.0]; |
996 6 -> 18 [penwidth=2.0]; |
996 } |
997 } |
997 |
998 |
998 Under the hood |
999 Under the hood |
999 -------------- |
1000 -------------- |
1000 |
1001 |
1068 |
1070 |
1069 $ html_output $TESTDIR/output/under-the-hood-amend-after-obslog-patch.log obslog -G -r typo --patch |
1071 $ html_output $TESTDIR/output/under-the-hood-amend-after-obslog-patch.log obslog -G -r typo --patch |
1070 o <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug |
1072 o <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug |
1071 | |
1073 | |
1072 x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug |
1074 x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug |
1073 rewritten(description) as <span style="color:olive;">708369dc1bfe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1075 rewritten(description) as <span style="color:olive;">708369dc1bfe</span> using <span style="font-weight:bold;">amend</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1074 --- a/5d48a444aba7-changeset-description |
1076 <span style="font-weight:bold;">diff -r 5d48a444aba7 -r 708369dc1bfe changeset-description</span> |
1075 +++ b/708369dc1bfe-changeset-description |
1077 <span style="font-weight:bold;color:red;">--- a/changeset-description</span> |
1076 @@ -1,1 +1,1 @@ |
1078 <span style="font-weight:bold;color:green;">+++ b/changeset-description</span> |
1077 -Fx bug |
1079 <span style="color:purple;">@@ -1,1 +1,1 @@</span> |
1078 +Fix bug |
1080 <span style="color:red;">-Fx bug</span> |
|
1081 <span style="color:green;">+Fix bug</span> |
1079 |
1082 |
1080 |
1083 |
1081 $ html_output $TESTDIR/output/under-the-hood-amend-after-obslog.log obslog -G -r typo |
1084 $ html_output $TESTDIR/output/under-the-hood-amend-after-obslog.log obslog -G -r typo |
1082 o <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug |
1085 o <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug |
1083 | |
1086 | |
1084 x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug |
1087 x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug |
1085 rewritten(description) as <span style="color:olive;">708369dc1bfe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1088 rewritten(description) as <span style="color:olive;">708369dc1bfe</span> using <span style="font-weight:bold;">amend</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1086 |
1089 |
1087 $ html_output $TESTDIR/output/under-the-hood-amend-after-obslog-no-all.log obslog -G -r "5d48a444aba7" --hidden |
1090 $ html_output $TESTDIR/output/under-the-hood-amend-after-obslog-no-all.log obslog -G -r "5d48a444aba7" --hidden |
1088 x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug |
1091 x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug |
1089 rewritten(description) as <span style="color:olive;">708369dc1bfe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1092 rewritten(description) as <span style="color:olive;">708369dc1bfe</span> using <span style="font-weight:bold;">amend</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1090 |
1093 |
1091 $ html_output $TESTDIR/output/under-the-hood-amend-after-obslog-all.log obslog -G -r "5d48a444aba7" --hidden --all |
1094 $ html_output $TESTDIR/output/under-the-hood-amend-after-obslog-all.log obslog -G -r "5d48a444aba7" --hidden --all |
1092 o <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug |
1095 o <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug |
1093 | |
1096 | |
1094 x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug |
1097 x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug |
1095 rewritten(description) as <span style="color:olive;">708369dc1bfe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1098 rewritten(description) as <span style="color:olive;">708369dc1bfe</span> using <span style="font-weight:bold;">amend</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1096 |
1099 |
1097 |
1100 |
1098 $ html_output $TESTDIR/output/under-the-hood-rebase-after-obslog.log obslog -r build/linuxsupport-v2 |
1101 $ html_output $TESTDIR/output/under-the-hood-rebase-after-obslog.log obslog -r build/linuxsupport-v2 |
1099 @ <span style="color:olive;">3d2c8a2356a2</span> <span style="color:blue;">(20)</span> Third commit on build/linuxsupport-v2 |
1102 @ <span style="color:olive;">3d2c8a2356a2</span> <span style="color:blue;">(20)</span> Third commit on build/linuxsupport-v2 |
1100 | |
1103 | |
1101 x <span style="color:olive;">39e9774ab30b</span> <span style="color:blue;">(5)</span> Third commit on build/linuxsupport-v2 |
1104 x <span style="color:olive;">39e9774ab30b</span> <span style="color:blue;">(5)</span> Third commit on build/linuxsupport-v2 |
1102 rewritten(parent) as <span style="color:olive;">3d2c8a2356a2</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1105 rewritten(parent) as <span style="color:olive;">3d2c8a2356a2</span> using <span style="font-weight:bold;">rebase</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1103 |
1106 |
1104 $ html_output $TESTDIR/output/under-the-hood-rebase-after-obslog-branch.log obslog -r "branch('build/linuxsupport-v2')" |
1107 $ html_output $TESTDIR/output/under-the-hood-rebase-after-obslog-branch.log obslog -r "branch('build/linuxsupport-v2')" |
1105 @ <span style="color:olive;">3d2c8a2356a2</span> <span style="color:blue;">(20)</span> Third commit on build/linuxsupport-v2 |
1108 @ <span style="color:olive;">3d2c8a2356a2</span> <span style="color:blue;">(20)</span> Third commit on build/linuxsupport-v2 |
1106 | |
1109 | |
1107 | o <span style="color:olive;">4686378320d7</span> <span style="color:blue;">(19)</span> Second commit on build/linuxsupport-v2. |
1110 | o <span style="color:olive;">4686378320d7</span> <span style="color:blue;">(19)</span> Second commit on build/linuxsupport-v2. |
1108 | | |
1111 | | |
1109 | | o <span style="color:olive;">7b62ce2c283e</span> <span style="color:blue;">(18)</span> First commit on build/linuxsupport-v2 |
1112 | | o <span style="color:olive;">7b62ce2c283e</span> <span style="color:blue;">(18)</span> First commit on build/linuxsupport-v2 |
1110 | | | |
1113 | | | |
1111 x | | <span style="color:olive;">39e9774ab30b</span> <span style="color:blue;">(5)</span> Third commit on build/linuxsupport-v2 |
1114 x | | <span style="color:olive;">39e9774ab30b</span> <span style="color:blue;">(5)</span> Third commit on build/linuxsupport-v2 |
1112 / / rewritten(parent) as <span style="color:olive;">3d2c8a2356a2</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1115 / / rewritten(parent) as <span style="color:olive;">3d2c8a2356a2</span> using <span style="font-weight:bold;">rebase</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1113 | | |
1116 | | |
1114 | x <span style="color:olive;">424916b62f4c</span> <span style="color:blue;">(3)</span> First commit on build/linuxsupport-v2 |
1117 | x <span style="color:olive;">424916b62f4c</span> <span style="color:blue;">(3)</span> First commit on build/linuxsupport-v2 |
1115 | rewritten(parent) as <span style="color:olive;">7b62ce2c283e</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1118 | rewritten(parent) as <span style="color:olive;">7b62ce2c283e</span> using <span style="font-weight:bold;">rebase</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1116 | |
1119 | |
1117 x <span style="color:olive;">5ad93176b041</span> <span style="color:blue;">(4)</span> Second commit on build/linuxsupport-v2. |
1120 x <span style="color:olive;">5ad93176b041</span> <span style="color:blue;">(4)</span> Second commit on build/linuxsupport-v2. |
1118 rewritten(parent) as <span style="color:olive;">4686378320d7</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1121 rewritten(parent) as <span style="color:olive;">4686378320d7</span> using <span style="font-weight:bold;">rebase</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1119 |
1122 |
1120 |
1123 |
1121 |
1124 |
1122 Rebase |
1125 Rebase |
1123 |
1126 |
1360 > n |
1363 > n |
1361 > y |
1364 > y |
1362 > EOF |
1365 > EOF |
1363 <span style="font-weight:bold;">diff --git a/fileextract b/fileextract</span> |
1366 <span style="font-weight:bold;">diff --git a/fileextract b/fileextract</span> |
1364 2 hunks, 2 lines changed |
1367 2 hunks, 2 lines changed |
1365 <span style="color:olive;">examine changes to 'fileextract'? [Ynesfdaq?]</span> y |
1368 <span style="color:olive;">examine changes to 'fileextract'?</span> |
|
1369 <span style="color:olive;">(enter ? for help) [Ynesfdaq?]</span> y |
1366 |
1370 |
1367 <span style="color:purple;">@@ -1,5 +1,6 @@</span> |
1371 <span style="color:purple;">@@ -1,5 +1,6 @@</span> |
1368 # The file dedicated to be extracted |
1372 # The file dedicated to be extracted |
1369 |
1373 |
1370 <span style="color:green;">+0</span> |
1374 <span style="color:green;">+0</span> |
1371 1 |
1375 1 |
1372 2 |
1376 2 |
1373 3 |
1377 3 |
1374 <span style="color:olive;">discard change 1/2 to 'fileextract'? [Ynesfdaq?]</span> n |
1378 <span style="color:olive;">discard change 1/2 to 'fileextract'?</span> |
|
1379 <span style="color:olive;">(enter ? for help) [Ynesfdaq?]</span> n |
1375 |
1380 |
1376 <span style="color:purple;">@@ -10,4 +11,5 @@</span> |
1381 <span style="color:purple;">@@ -10,4 +11,5 @@</span> |
1377 8 |
1382 8 |
1378 9 |
1383 9 |
1379 10 |
1384 10 |
1380 <span style="color:green;">+42</span> |
1385 <span style="color:green;">+42</span> |
1381 |
1386 |
1382 <span style="color:olive;">discard change 2/2 to 'fileextract'? [Ynesfdaq?]</span> y |
1387 <span style="color:olive;">discard change 2/2 to 'fileextract'?</span> |
|
1388 <span style="color:olive;">(enter ? for help) [Ynesfdaq?]</span> y |
1383 |
1389 |
1384 |
1390 |
1385 $ html_output $TESTDIR/output/amend-extract-after-status.log status |
1391 $ html_output $TESTDIR/output/amend-extract-after-status.log status |
1386 <span style="color:blue;font-weight:bold;">M </span><span style="color:blue;font-weight:bold;">fileextract</span> |
1392 <span style="font-weight:bold;color:blue;">M </span><span style="font-weight:bold;color:blue;">fileextract</span> |
1387 |
1393 |
1388 $ html_output $TESTDIR/output/amend-extract-after-diff.log diff |
1394 $ html_output $TESTDIR/output/amend-extract-after-diff.log diff |
1389 <span style="font-weight:bold;">diff -r 76ace846a3f9 fileextract</span> |
1395 <span style="font-weight:bold;">diff -r 76ace846a3f9 fileextract</span> |
1390 <span style="color:red;font-weight:bold;">--- a/fileextract Fri Dec 08 15:28:46 2017 +0100</span> |
1396 <span style="font-weight:bold;color:red;">--- a/fileextract Fri Dec 08 15:28:46 2017 +0100</span> |
1391 <span style="color:green;font-weight:bold;">+++ b/fileextract Thu Jan 01 00:00:00 1970 +0000</span> |
1397 <span style="font-weight:bold;color:green;">+++ b/fileextract Thu Jan 01 00:00:00 1970 +0000</span> |
1392 <span style="color:purple;">@@ -11,4 +11,5 @@</span> |
1398 <span style="color:purple;">@@ -11,4 +11,5 @@</span> |
1393 8 |
1399 8 |
1394 9 |
1400 9 |
1395 10 |
1401 10 |
1396 <span style="color:green;">+42</span> |
1402 <span style="color:green;">+42</span> |
1401 |
1407 |
1402 $ html_output $TESTDIR/output/amend-extract-after-obslog.log obslog -p -r . |
1408 $ html_output $TESTDIR/output/amend-extract-after-obslog.log obslog -p -r . |
1403 @ <span style="color:olive;">76ace846a3f9</span> <span style="color:blue;">(24)</span> Commit to be extracted |
1409 @ <span style="color:olive;">76ace846a3f9</span> <span style="color:blue;">(24)</span> Commit to be extracted |
1404 | |
1410 | |
1405 x <span style="color:olive;">1e04751ef00a</span> <span style="color:blue;">(22)</span> Commit to be extracted |
1411 x <span style="color:olive;">1e04751ef00a</span> <span style="color:blue;">(22)</span> Commit to be extracted |
1406 | rewritten(content) as <span style="color:olive;">76ace846a3f9</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1412 | rewritten(content) as <span style="color:olive;">76ace846a3f9</span> using <span style="font-weight:bold;">uncommit</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1407 | diff -r 1e04751ef00a -r 76ace846a3f9 fileextract |
1413 | <span style="font-weight:bold;">diff -r 1e04751ef00a -r 76ace846a3f9 fileextract</span> |
1408 | --- a/fileextract Fri Dec 08 15:28:46 2017 +0100 |
1414 | <span style="font-weight:bold;color:red;">--- a/fileextract Fri Dec 08 15:28:46 2017 +0100</span> |
1409 | +++ b/fileextract Fri Dec 08 15:28:46 2017 +0100 |
1415 | <span style="font-weight:bold;color:green;">+++ b/fileextract Fri Dec 08 15:28:46 2017 +0100</span> |
1410 | @@ -11,5 +11,4 @@ |
1416 | <span style="color:purple;">@@ -11,5 +11,4 @@</span> |
1411 | 8 |
1417 | 8 |
1412 | 9 |
1418 | 9 |
1413 | 10 |
1419 | 10 |
1414 | -42 |
1420 | <span style="color:red;">-42</span> |
1415 | |
1421 | |
1416 | |
1422 | |
1417 | |
1423 | |
1418 x <span style="color:olive;">5935c1c3ad24</span> <span style="color:blue;">(21)</span> Commit to be extracted |
1424 x <span style="color:olive;">5935c1c3ad24</span> <span style="color:blue;">(21)</span> Commit to be extracted |
1419 | rewritten(content) as <span style="color:olive;">1e04751ef00a</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1425 | rewritten(content) as <span style="color:olive;">1e04751ef00a</span> using <span style="font-weight:bold;">uncommit</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1420 | diff -r 5935c1c3ad24 -r 1e04751ef00a badfile |
1426 | <span style="font-weight:bold;">diff -r 5935c1c3ad24 -r 1e04751ef00a badfile</span> |
1421 | --- a/badfile Fri Dec 08 15:28:46 2017 +0100 |
1427 | <span style="font-weight:bold;color:red;">--- a/badfile Fri Dec 08 15:28:46 2017 +0100</span> |
1422 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1428 | <span style="font-weight:bold;color:green;">+++ /dev/null Thu Jan 01 00:00:00 1970 +0000</span> |
1423 | @@ -1,1 +0,0 @@ |
1429 | <span style="color:purple;">@@ -1,1 +0,0 @@</span> |
1424 | -badbadfile |
1430 | <span style="color:red;">-badbadfile</span> |
1425 | |
1431 | |
1426 | |
1432 | |
1427 x <span style="color:olive;">e288d12d5e96</span> <span style="color:blue;">(8)</span> Commit to be extracted |
1433 x <span style="color:olive;">e288d12d5e96</span> <span style="color:blue;">(8)</span> Commit to be extracted |
1428 rewritten(user) as <span style="color:olive;">5935c1c3ad24</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1434 rewritten(user) as <span style="color:olive;">5935c1c3ad24</span> using <span style="font-weight:bold;">amend</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1429 |
1435 |
1430 |
1436 |
1431 $ graph $TESTDIR/graphs/amend-extract-after-hidden.dot -r "::desc(extracted)" -T "{shortest(node, 8)}" --hidden --public=yes |
1437 $ graph $TESTDIR/graphs/amend-extract-after-hidden.dot -r "::desc(extracted)" -T "{shortest(node, 8)}" --hidden --public=yes |
1432 Wrote */graphs/amend-extract-after-hidden.dot (glob) |
1438 Wrote */graphs/amend-extract-after-hidden.dot (glob) |
1433 .. graphviz:: |
1439 .. graphviz:: |
1435 strict digraph "Mercurial graph" { |
1441 strict digraph "Mercurial graph" { |
1436 graph [rankdir=LR, |
1442 graph [rankdir=LR, |
1437 splines=polyline |
1443 splines=polyline |
1438 ]; |
1444 ]; |
1439 node [label="\N"]; |
1445 node [label="\N"]; |
1440 0 [fillcolor="#7F7FFF", |
1446 0 [fillcolor="#7F7FFF", |
1441 fixedsize=true, |
1447 fixedsize=true, |
1442 group=default, |
1448 group=default, |
1443 height=1, |
1449 height=1, |
1444 label=d2eb2ac6, |
1450 label=d2eb2ac6, |
1445 pin=true, |
1451 pin=true, |
1446 pos="1,0!", |
1452 pos="1,0!", |
1447 shape=circle, |
1453 shape=circle, |
1448 style=filled, |
1454 style=filled, |
1449 width=1]; |
1455 width=1]; |
1450 7 [fillcolor="#7F7FFF", |
1456 7 [fillcolor="#7F7FFF", |
1451 fixedsize=true, |
1457 fixedsize=true, |
1452 group="amend-extract", |
1458 group="amend-extract", |
1453 height=1, |
1459 height=1, |
1454 label="4ae0d1de", |
1460 label="4ae0d1de", |
1455 pin=true, |
1461 pin=true, |
1456 pos="2,7!", |
1462 pos="2,7!", |
1457 shape=circle, |
1463 shape=circle, |
1458 style=filled, |
1464 style=filled, |
1459 width=1]; |
1465 width=1]; |
1460 0 -> 7 [penwidth=2.0]; |
1466 0 -> 7 [penwidth=2.0]; |
1461 8 [fillcolor="#DFDFFF", |
1467 8 [fillcolor="#DFDFFF", |
1462 fixedsize=true, |
1468 fixedsize=true, |
1463 group="amend-extract_extinct", |
1469 group="amend-extract_extinct", |
1464 height=1, |
1470 height=1, |
1465 label=e288d12d, |
1471 label=e288d12d, |
1466 pin=true, |
1472 pin=true, |
1467 pos="3,8!", |
1473 pos="3,8!", |
1468 shape=circle, |
1474 shape=circle, |
1469 style="dotted, filled", |
1475 style="dotted, filled", |
1470 width=1]; |
1476 width=1]; |
1471 7 -> 8 [penwidth=2.0]; |
1477 7 -> 8 [penwidth=2.0]; |
1472 21 [fillcolor="#DFDFFF", |
1478 21 [fillcolor="#DFDFFF", |
1473 fixedsize=true, |
1479 fixedsize=true, |
1474 group="amend-extract_extinct", |
1480 group="amend-extract_extinct", |
1475 height=1, |
1481 height=1, |
1476 label="5935c1c3", |
1482 label="5935c1c3", |
1477 pin=true, |
1483 pin=true, |
1478 pos="3,21!", |
1484 pos="3,21!", |
1479 shape=circle, |
1485 shape=circle, |
1480 style="dotted, filled", |
1486 style="dotted, filled", |
1481 width=1]; |
1487 width=1]; |
1482 7 -> 21 [penwidth=2.0]; |
1488 7 -> 21 [penwidth=2.0]; |
1483 22 [fillcolor="#DFDFFF", |
1489 22 [fillcolor="#DFDFFF", |
1484 fixedsize=true, |
1490 fixedsize=true, |
1485 group="amend-extract_extinct", |
1491 group="amend-extract_extinct", |
1486 height=1, |
1492 height=1, |
1487 label="1e04751e", |
1493 label="1e04751e", |
1488 pin=true, |
1494 pin=true, |
1489 pos="3,22!", |
1495 pos="3,22!", |
1490 shape=circle, |
1496 shape=circle, |
1491 style="dotted, filled", |
1497 style="dotted, filled", |
1492 width=1]; |
1498 width=1]; |
1493 7 -> 22 [penwidth=2.0]; |
1499 7 -> 22 [penwidth=2.0]; |
1494 24 [fillcolor="#7F7FFF", |
1500 24 [fillcolor="#7F7FFF", |
1495 fixedsize=true, |
1501 fixedsize=true, |
1496 group="amend-extract", |
1502 group="amend-extract", |
1497 height=1, |
1503 height=1, |
1498 label="76ace846", |
1504 label="76ace846", |
1499 pin=true, |
1505 pin=true, |
1500 pos="2,24!", |
1506 pos="2,24!", |
1501 shape=circle, |
1507 shape=circle, |
1502 style=filled, |
1508 style=filled, |
1503 width=1]; |
1509 width=1]; |
1504 7 -> 24 [penwidth=2.0]; |
1510 7 -> 24 [penwidth=2.0]; |
1505 8 -> 21 [arrowtail=dot, |
1511 8 -> 21 [arrowtail=dot, |
1506 dir=back, |
1512 dir=back, |
1507 minlen=0, |
1513 minlen=0, |
1508 penwidth=2.0, |
1514 penwidth=2.0, |
1509 style=dashed]; |
1515 style=dashed]; |
1510 21 -> 22 [arrowtail=dot, |
1516 21 -> 22 [arrowtail=dot, |
1511 dir=back, |
1517 dir=back, |
1512 minlen=0, |
1518 minlen=0, |
1513 penwidth=2.0, |
1519 penwidth=2.0, |
1514 style=dashed]; |
1520 style=dashed]; |
1515 22 -> 24 [arrowtail=dot, |
1521 22 -> 24 [arrowtail=dot, |
1516 dir=back, |
1522 dir=back, |
1517 minlen=0, |
1523 minlen=0, |
1518 penwidth=2.0, |
1524 penwidth=2.0, |
1519 style=dashed]; |
1525 style=dashed]; |
1520 } |
1526 } |
1838 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
1844 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
1839 adding src/A |
1845 adding src/A |
1840 adding src/B |
1846 adding src/B |
1841 adding src/C |
1847 adding src/C |
1842 <span style="font-weight:bold;">diff --git a/src/A b/src/A</span> |
1848 <span style="font-weight:bold;">diff --git a/src/A b/src/A</span> |
1843 <span style="color:teal;font-weight:bold;">new file mode 100644</span> |
1849 <span style="font-weight:bold;color:teal;">new file mode 100644</span> |
1844 <span style="color:olive;">examine changes to 'src/A'? [Ynesfdaq?]</span> Y |
1850 <span style="color:olive;">examine changes to 'src/A'?</span> |
|
1851 <span style="color:olive;">(enter ? for help) [Ynesfdaq?]</span> Y |
1845 |
1852 |
1846 <span style="font-weight:bold;">diff --git a/src/B b/src/B</span> |
1853 <span style="font-weight:bold;">diff --git a/src/B b/src/B</span> |
1847 <span style="color:teal;font-weight:bold;">new file mode 100644</span> |
1854 <span style="font-weight:bold;color:teal;">new file mode 100644</span> |
1848 <span style="color:olive;">examine changes to 'src/B'? [Ynesfdaq?]</span> N |
1855 <span style="color:olive;">examine changes to 'src/B'?</span> |
|
1856 <span style="color:olive;">(enter ? for help) [Ynesfdaq?]</span> N |
1849 |
1857 |
1850 <span style="font-weight:bold;">diff --git a/src/C b/src/C</span> |
1858 <span style="font-weight:bold;">diff --git a/src/C b/src/C</span> |
1851 <span style="color:teal;font-weight:bold;">new file mode 100644</span> |
1859 <span style="font-weight:bold;color:teal;">new file mode 100644</span> |
1852 <span style="color:olive;">examine changes to 'src/C'? [Ynesfdaq?]</span> N |
1860 <span style="color:olive;">examine changes to 'src/C'?</span> |
|
1861 <span style="color:olive;">(enter ? for help) [Ynesfdaq?]</span> N |
1853 |
1862 |
1854 created new head |
1863 created new head |
1855 <span style="color:olive;">Done splitting? [yN]</span> N |
1864 (consider using topic for lightweight branches. See 'hg help topic') |
|
1865 <span style="color:olive;">continue splitting? [Ycdq?]</span> N |
1856 <span style="font-weight:bold;">diff --git a/src/B b/src/B</span> |
1866 <span style="font-weight:bold;">diff --git a/src/B b/src/B</span> |
1857 <span style="color:teal;font-weight:bold;">new file mode 100644</span> |
1867 <span style="font-weight:bold;color:teal;">new file mode 100644</span> |
1858 <span style="color:olive;">examine changes to 'src/B'? [Ynesfdaq?]</span> Y |
1868 <span style="color:olive;">examine changes to 'src/B'?</span> |
|
1869 <span style="color:olive;">(enter ? for help) [Ynesfdaq?]</span> Y |
1859 |
1870 |
1860 <span style="font-weight:bold;">diff --git a/src/C b/src/C</span> |
1871 <span style="font-weight:bold;">diff --git a/src/C b/src/C</span> |
1861 <span style="color:teal;font-weight:bold;">new file mode 100644</span> |
1872 <span style="font-weight:bold;color:teal;">new file mode 100644</span> |
1862 <span style="color:olive;">examine changes to 'src/C'? [Ynesfdaq?]</span> N |
1873 <span style="color:olive;">examine changes to 'src/C'?</span> |
1863 |
1874 <span style="color:olive;">(enter ? for help) [Ynesfdaq?]</span> N |
1864 <span style="color:olive;">Done splitting? [yN]</span> N |
1875 |
|
1876 <span style="color:olive;">continue splitting? [Ycdq?]</span> N |
1865 <span style="font-weight:bold;">diff --git a/src/C b/src/C</span> |
1877 <span style="font-weight:bold;">diff --git a/src/C b/src/C</span> |
1866 <span style="color:teal;font-weight:bold;">new file mode 100644</span> |
1878 <span style="font-weight:bold;color:teal;">new file mode 100644</span> |
1867 <span style="color:olive;">examine changes to 'src/C'? [Ynesfdaq?]</span> Y |
1879 <span style="color:olive;">examine changes to 'src/C'?</span> |
|
1880 <span style="color:olive;">(enter ? for help) [Ynesfdaq?]</span> Y |
1868 |
1881 |
1869 no more change to split |
1882 no more change to split |
1870 |
1883 |
1871 $ html_output $TESTDIR/output/split-before-after.log log -r "::split" -G |
1884 $ html_output $TESTDIR/output/split-before-after.log log -r "::split" -G |
1872 @ <span style="color:olive;">changeset: 28:1b7281b1e052</span> |
1885 @ <span style="color:olive;">changeset: 28:1b7281b1e052</span> |
1901 strict digraph "Mercurial graph" { |
1914 strict digraph "Mercurial graph" { |
1902 graph [rankdir=LR, |
1915 graph [rankdir=LR, |
1903 splines=polyline |
1916 splines=polyline |
1904 ]; |
1917 ]; |
1905 node [label="\N"]; |
1918 node [label="\N"]; |
1906 0 [fillcolor="#7F7FFF", |
1919 0 [fillcolor="#7F7FFF", |
1907 fixedsize=true, |
1920 fixedsize=true, |
1908 group=default, |
1921 group=default, |
1909 height=1, |
1922 height=1, |
1910 label=d2eb2ac6, |
1923 label=d2eb2ac6, |
1911 pin=true, |
1924 pin=true, |
1912 pos="1,0!", |
1925 pos="1,0!", |
1913 shape=circle, |
1926 shape=circle, |
1914 style=filled, |
1927 style=filled, |
1915 width=1]; |
1928 width=1]; |
1916 13 [fillcolor="#DFDFFF", |
1929 13 [fillcolor="#DFDFFF", |
1917 fixedsize=true, |
1930 fixedsize=true, |
1918 group=split_extinct, |
1931 group=split_extinct, |
1919 height=1, |
1932 height=1, |
1920 label="5d5029b9", |
1933 label="5d5029b9", |
1921 pin=true, |
1934 pin=true, |
1922 pos="2,13!", |
1935 pos="2,13!", |
1923 shape=circle, |
1936 shape=circle, |
1924 style="dotted, filled", |
1937 style="dotted, filled", |
1925 width=1]; |
1938 width=1]; |
1926 0 -> 13 [penwidth=2.0]; |
1939 0 -> 13 [penwidth=2.0]; |
1927 26 [fillcolor="#7F7FFF", |
1940 26 [fillcolor="#7F7FFF", |
1928 fixedsize=true, |
1941 fixedsize=true, |
1929 group=split, |
1942 group=split, |
1930 height=1, |
1943 height=1, |
1931 label="59f0ddc4", |
1944 label="59f0ddc4", |
1932 pin=true, |
1945 pin=true, |
1933 pos="3,26!", |
1946 pos="3,26!", |
1934 shape=circle, |
1947 shape=circle, |
1935 style=filled, |
1948 style=filled, |
1936 width=1]; |
1949 width=1]; |
1937 0 -> 26 [penwidth=2.0]; |
1950 0 -> 26 [penwidth=2.0]; |
1938 13 -> 26 [arrowtail=dot, |
1951 13 -> 26 [arrowtail=dot, |
1939 dir=back, |
1952 dir=back, |
1940 minlen=0, |
1953 minlen=0, |
1941 penwidth=2.0, |
1954 penwidth=2.0, |
1942 style=dashed]; |
1955 style=dashed]; |
1943 27 [fillcolor="#7F7FFF", |
1956 27 [fillcolor="#7F7FFF", |
1944 fixedsize=true, |
1957 fixedsize=true, |
1945 group=split, |
1958 group=split, |
1946 height=1, |
1959 height=1, |
1947 label="6fb7bfb4", |
1960 label="6fb7bfb4", |
1948 pin=true, |
1961 pin=true, |
1949 pos="3,27!", |
1962 pos="3,27!", |
1950 shape=circle, |
1963 shape=circle, |
1951 style=filled, |
1964 style=filled, |
1952 width=1]; |
1965 width=1]; |
1953 13 -> 27 [arrowtail=dot, |
1966 13 -> 27 [arrowtail=dot, |
1954 dir=back, |
1967 dir=back, |
1955 minlen=0, |
1968 minlen=0, |
1956 penwidth=2.0, |
1969 penwidth=2.0, |
1957 style=dashed]; |
1970 style=dashed]; |
1958 28 [fillcolor="#7F7FFF", |
1971 28 [fillcolor="#7F7FFF", |
1959 fixedsize=true, |
1972 fixedsize=true, |
1960 group=split, |
1973 group=split, |
1961 height=1, |
1974 height=1, |
1962 label="1b7281b1", |
1975 label="1b7281b1", |
1963 pin=true, |
1976 pin=true, |
1964 pos="3,28!", |
1977 pos="3,28!", |
1965 shape=circle, |
1978 shape=circle, |
1966 style=filled, |
1979 style=filled, |
1967 width=1]; |
1980 width=1]; |
1968 13 -> 28 [arrowtail=dot, |
1981 13 -> 28 [arrowtail=dot, |
1969 dir=back, |
1982 dir=back, |
1970 minlen=0, |
1983 minlen=0, |
1971 penwidth=2.0, |
1984 penwidth=2.0, |
1972 style=dashed]; |
1985 style=dashed]; |
1973 26 -> 27 [penwidth=2.0]; |
1986 26 -> 27 [penwidth=2.0]; |
1974 27 -> 28 [penwidth=2.0]; |
1987 27 -> 28 [penwidth=2.0]; |
1975 } |
1988 } |
1976 |
1989 |
1977 $ html_output $TESTDIR/output/split-after-obslog.log obslog -r . |
1990 $ html_output $TESTDIR/output/split-after-obslog.log obslog -r . |
1978 @ <span style="color:olive;">1b7281b1e052</span> <span style="color:blue;">(28)</span> To be splitted |
1991 @ <span style="color:olive;">1b7281b1e052</span> <span style="color:blue;">(28)</span> To be splitted |
1979 | |
1992 | |
1980 x <span style="color:olive;">5d5029b9daed</span> <span style="color:blue;">(13)</span> To be splitted |
1993 x <span style="color:olive;">5d5029b9daed</span> <span style="color:blue;">(13)</span> To be splitted |
1981 rewritten(date, parent, content) as <span style="color:olive;">1b7281b1e052, 59f0ddc4bd4b, 6fb7bfb44ffe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1994 rewritten(date, parent, content) as <span style="color:olive;">1b7281b1e052, 59f0ddc4bd4b, 6fb7bfb44ffe</span> using <span style="font-weight:bold;">split</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1982 |
1995 |
1983 $ html_output $TESTDIR/output/split-after-obslog-all.log obslog --all -r . |
1996 $ html_output $TESTDIR/output/split-after-obslog-all.log obslog --all -r . |
1984 @ <span style="color:olive;">1b7281b1e052</span> <span style="color:blue;">(28)</span> To be splitted |
1997 @ <span style="color:olive;">1b7281b1e052</span> <span style="color:blue;">(28)</span> To be splitted |
1985 | |
1998 | |
1986 | o <span style="color:olive;">59f0ddc4bd4b</span> <span style="color:blue;">(26)</span> To be splitted |
1999 | o <span style="color:olive;">59f0ddc4bd4b</span> <span style="color:blue;">(26)</span> To be splitted |
1987 |/ |
2000 |/ |
1988 | o <span style="color:olive;">6fb7bfb44ffe</span> <span style="color:blue;">(27)</span> To be splitted |
2001 | o <span style="color:olive;">6fb7bfb44ffe</span> <span style="color:blue;">(27)</span> To be splitted |
1989 |/ |
2002 |/ |
1990 x <span style="color:olive;">5d5029b9daed</span> <span style="color:blue;">(13)</span> To be splitted |
2003 x <span style="color:olive;">5d5029b9daed</span> <span style="color:blue;">(13)</span> To be splitted |
1991 rewritten(date, parent, content) as <span style="color:olive;">1b7281b1e052, 59f0ddc4bd4b, 6fb7bfb44ffe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
2004 rewritten(date, parent, content) as <span style="color:olive;">1b7281b1e052, 59f0ddc4bd4b, 6fb7bfb44ffe</span> using <span style="font-weight:bold;">split</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
1992 |
2005 |
1993 $ html_output $TESTDIR/output/split-after-log-phase.log log -G -r "::split" --template "{rev} {phase}\n" |
2006 $ html_output $TESTDIR/output/split-after-log-phase.log log -G -r "::split" --template "{rev} {phase}\n" |
1994 @ 28 draft |
2007 @ 28 draft |
1995 | |
2008 | |
1996 o 27 draft |
2009 o 27 draft |
2033 strict digraph "Mercurial graph" { |
2046 strict digraph "Mercurial graph" { |
2034 graph [rankdir=LR, |
2047 graph [rankdir=LR, |
2035 splines=polyline |
2048 splines=polyline |
2036 ]; |
2049 ]; |
2037 node [label="\N"]; |
2050 node [label="\N"]; |
2038 0 [fillcolor="#7F7FFF", |
2051 0 [fillcolor="#7F7FFF", |
2039 fixedsize=true, |
2052 fixedsize=true, |
2040 group=default, |
2053 group=default, |
2041 height=1, |
2054 height=1, |
2042 label=d2eb2ac6, |
2055 label=d2eb2ac6, |
2043 pin=true, |
2056 pin=true, |
2044 pos="1,0!", |
2057 pos="1,0!", |
2045 shape=circle, |
2058 shape=circle, |
2046 style=filled, |
2059 style=filled, |
2047 width=1]; |
2060 width=1]; |
2048 9 [fillcolor="#7F7FFF", |
2061 9 [fillcolor="#7F7FFF", |
2049 fixedsize=true, |
2062 fixedsize=true, |
2050 group=prune, |
2063 group=prune, |
2051 height=1, |
2064 height=1, |
2052 label="324b72eb", |
2065 label="324b72eb", |
2053 pin=true, |
2066 pin=true, |
2054 pos="2,9!", |
2067 pos="2,9!", |
2055 shape=circle, |
2068 shape=circle, |
2056 style=filled, |
2069 style=filled, |
2057 width=1]; |
2070 width=1]; |
2058 0 -> 9 [penwidth=2.0]; |
2071 0 -> 9 [penwidth=2.0]; |
2059 } |
2072 } |
2060 |
2073 |
2061 $ html_output $TESTDIR/output/prune.log prune -r . |
2074 $ html_output $TESTDIR/output/prune.log prune -r . |
2062 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
2075 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
2063 working directory now at <span style="color:olive;">d2eb2ac6a5bd</span> |
2076 working directory is now at <span style="color:olive;">d2eb2ac6a5bd</span> |
2064 1 changesets pruned |
2077 1 changesets pruned |
2065 |
2078 |
2066 $ html_output $TESTDIR/output/prune-after.log log -G -r "::prune" |
2079 $ html_output $TESTDIR/output/prune-after.log log -G -r "::prune" |
2067 abort: unknown revision 'prune'! |
2080 <span style="color:red;">abort: unknown revision 'prune'!</span> |
2068 |
2081 |
2069 $ html_output $TESTDIR/output/prune-after-hidden.log log -G -r "::prune" --hidden |
2082 $ html_output $TESTDIR/output/prune-after-hidden.log log -G -r "::prune" --hidden |
2070 x <span style="color:olive;">changeset: 9:324b72ebbb21</span> |
2083 x <span style="color:olive;">changeset: 9:324b72ebbb21</span> |
2071 | branch: prune |
2084 | branch: prune |
2072 | parent: 0:d2eb2ac6a5bd |
2085 | parent: 0:d2eb2ac6a5bd |
2073 | user: Boris Feld <boris.feld@octobus.net> |
2086 | user: Boris Feld <boris.feld@octobus.net> |
2074 | date: Fri Dec 08 16:12:23 2017 +0100 |
2087 | date: Fri Dec 08 16:12:23 2017 +0100 |
2075 | obsolete: pruned |
2088 | obsolete: pruned using prune |
2076 | summary: Commit to prune |
2089 | summary: Commit to prune |
2077 | |
2090 | |
2078 @ <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
2091 @ <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
2079 user: Boris Feld <boris.feld@octobus.net> |
2092 user: Boris Feld <boris.feld@octobus.net> |
2080 date: Thu Dec 07 11:26:05 2017 +0100 |
2093 date: Thu Dec 07 11:26:05 2017 +0100 |
2081 summary: ROOT |
2094 summary: ROOT |
2082 |
2095 |
2083 |
2096 |
2084 $ html_output $TESTDIR/output/prune-after-obslog.log obslog -r "prune" --hidden |
2097 $ html_output $TESTDIR/output/prune-after-obslog.log obslog -r "prune" --hidden |
2085 x <span style="color:olive;">324b72ebbb21</span> <span style="color:blue;">(9)</span> Commit to prune |
2098 x <span style="color:olive;">324b72ebbb21</span> <span style="color:blue;">(9)</span> Commit to prune |
2086 pruned by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
2099 pruned using <span style="font-weight:bold;">prune</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
2087 |
2100 |
2088 $ graph $TESTDIR/graphs/prune-after-hidden.dot -r '::prune' -T "{shortest(node, 8)}" --hidden --public=yes |
2101 $ graph $TESTDIR/graphs/prune-after-hidden.dot -r '::prune' -T "{shortest(node, 8)}" --hidden --public=yes |
2089 Wrote */graphs/prune-after-hidden.dot (glob) |
2102 Wrote */graphs/prune-after-hidden.dot (glob) |
2090 .. graphviz:: |
2103 .. graphviz:: |
2091 |
2104 |
2092 strict digraph "Mercurial graph" { |
2105 strict digraph "Mercurial graph" { |
2093 graph [rankdir=LR, |
2106 graph [rankdir=LR, |
2094 splines=polyline |
2107 splines=polyline |
2095 ]; |
2108 ]; |
2096 node [label="\N"]; |
2109 node [label="\N"]; |
2097 0 [fillcolor="#7F7FFF", |
2110 0 [fillcolor="#7F7FFF", |
2098 fixedsize=true, |
2111 fixedsize=true, |
2099 group=default, |
2112 group=default, |
2100 height=1, |
2113 height=1, |
2101 label=d2eb2ac6, |
2114 label=d2eb2ac6, |
2102 pin=true, |
2115 pin=true, |
2103 pos="1,0!", |
2116 pos="1,0!", |
2104 shape=circle, |
2117 shape=circle, |
2105 style=filled, |
2118 style=filled, |
2106 width=1]; |
2119 width=1]; |
2107 9 [fillcolor="#DFDFFF", |
2120 9 [fillcolor="#DFDFFF", |
2108 fixedsize=true, |
2121 fixedsize=true, |
2109 group=prune_extinct, |
2122 group=prune_extinct, |
2110 height=1, |
2123 height=1, |
2111 label="324b72eb", |
2124 label="324b72eb", |
2112 pin=true, |
2125 pin=true, |
2113 pos="2,9!", |
2126 pos="2,9!", |
2114 shape=circle, |
2127 shape=circle, |
2115 style="dotted, filled", |
2128 style="dotted, filled", |
2116 width=1]; |
2129 width=1]; |
2117 0 -> 9 [penwidth=2.0]; |
2130 0 -> 9 [penwidth=2.0]; |
2118 } |
2131 } |
2119 |
2132 |
2120 Histedit |
2133 Histedit |
2121 -------- |
2134 -------- |
2122 |
2135 |
2311 strict digraph "Mercurial graph" { |
2324 strict digraph "Mercurial graph" { |
2312 graph [rankdir=LR, |
2325 graph [rankdir=LR, |
2313 splines=polyline |
2326 splines=polyline |
2314 ]; |
2327 ]; |
2315 node [label="\N"]; |
2328 node [label="\N"]; |
2316 0 [fillcolor="#7F7FFF", |
2329 0 [fillcolor="#7F7FFF", |
2317 fixedsize=true, |
2330 fixedsize=true, |
2318 group=default, |
2331 group=default, |
2319 height=1, |
2332 height=1, |
2320 label=d2eb2ac6, |
2333 label=d2eb2ac6, |
2321 pin=true, |
2334 pin=true, |
2322 pos="1,0!", |
2335 pos="1,0!", |
2323 shape=circle, |
2336 shape=circle, |
2324 style=filled, |
2337 style=filled, |
2325 width=1]; |
2338 width=1]; |
2326 14 [fillcolor="#7F7FFF", |
2339 14 [fillcolor="#7F7FFF", |
2327 fixedsize=true, |
2340 fixedsize=true, |
2328 group=histedit, |
2341 group=histedit, |
2329 height=1, |
2342 height=1, |
2330 label=d102c718, |
2343 label=d102c718, |
2331 pin=true, |
2344 pin=true, |
2332 pos="2,14!", |
2345 pos="2,14!", |
2333 shape=circle, |
2346 shape=circle, |
2334 style=filled, |
2347 style=filled, |
2335 width=1]; |
2348 width=1]; |
2336 0 -> 14 [penwidth=2.0]; |
2349 0 -> 14 [penwidth=2.0]; |
2337 15 [fillcolor="#DFDFFF", |
2350 15 [fillcolor="#DFDFFF", |
2338 fixedsize=true, |
2351 fixedsize=true, |
2339 group=histedit_extinct, |
2352 group=histedit_extinct, |
2340 height=1, |
2353 height=1, |
2341 label="23eb6f9e", |
2354 label="23eb6f9e", |
2342 pin=true, |
2355 pin=true, |
2343 pos="3,15!", |
2356 pos="3,15!", |
2344 shape=circle, |
2357 shape=circle, |
2345 style="dotted, filled", |
2358 style="dotted, filled", |
2346 width=1]; |
2359 width=1]; |
2347 14 -> 15 [penwidth=2.0]; |
2360 14 -> 15 [penwidth=2.0]; |
2348 29 [fillcolor="#7F7FFF", |
2361 29 [fillcolor="#7F7FFF", |
2349 fixedsize=true, |
2362 fixedsize=true, |
2350 group=histedit, |
2363 group=histedit, |
2351 height=1, |
2364 height=1, |
2352 label=a2082e40, |
2365 label=a2082e40, |
2353 pin=true, |
2366 pin=true, |
2354 pos="2,29!", |
2367 pos="2,29!", |
2355 shape=circle, |
2368 shape=circle, |
2356 style=filled, |
2369 style=filled, |
2357 width=1]; |
2370 width=1]; |
2358 14 -> 29 [penwidth=2.0]; |
2371 14 -> 29 [penwidth=2.0]; |
2359 30 [fillcolor="#7F7FFF", |
2372 30 [fillcolor="#7F7FFF", |
2360 fixedsize=true, |
2373 fixedsize=true, |
2361 group=histedit, |
2374 group=histedit, |
2362 height=1, |
2375 height=1, |
2363 label="27cb8906", |
2376 label="27cb8906", |
2364 pin=true, |
2377 pin=true, |
2365 pos="2,30!", |
2378 pos="2,30!", |
2366 shape=circle, |
2379 shape=circle, |
2367 style=filled, |
2380 style=filled, |
2368 width=1]; |
2381 width=1]; |
2369 15 -> 30 [arrowtail=dot, |
2382 15 -> 30 [arrowtail=dot, |
2370 dir=back, |
2383 dir=back, |
2371 minlen=0, |
2384 minlen=0, |
2372 penwidth=2.0, |
2385 penwidth=2.0, |
2373 style=dashed]; |
2386 style=dashed]; |
2374 16 [fillcolor="#DFDFFF", |
2387 16 [fillcolor="#DFDFFF", |
2375 fixedsize=true, |
2388 fixedsize=true, |
2376 group=histedit_extinct, |
2389 group=histedit_extinct, |
2377 height=1, |
2390 height=1, |
2378 label="1b1e58a9", |
2391 label="1b1e58a9", |
2379 pin=true, |
2392 pin=true, |
2380 pos="3,16!", |
2393 pos="3,16!", |
2381 shape=circle, |
2394 shape=circle, |
2382 style="dotted, filled", |
2395 style="dotted, filled", |
2383 width=1]; |
2396 width=1]; |
2384 15 -> 16 [penwidth=2.0]; |
2397 15 -> 16 [penwidth=2.0]; |
2385 16 -> 29 [arrowtail=dot, |
2398 16 -> 29 [arrowtail=dot, |
2386 dir=back, |
2399 dir=back, |
2387 minlen=0, |
2400 minlen=0, |
2388 penwidth=2.0, |
2401 penwidth=2.0, |
2389 style=dashed]; |
2402 style=dashed]; |
2390 29 -> 30 [penwidth=2.0]; |
2403 29 -> 30 [penwidth=2.0]; |
2391 } |
2404 } |
2392 |
2405 |
2393 Stack |
2406 Stack |
2394 ----- |
2407 ----- |
2395 |
2408 |
2396 $ hg update typo |
2409 $ hg update typo |
2397 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
2410 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
2398 |
2411 |
2399 $ html_output $TESTDIR/output/stack-typo.log stack |
2412 $ html_output $TESTDIR/output/stack-typo.log stack |
2400 ### target: typo (branch) |
2413 ### target: typo (branch) |
2401 <span style="color:teal;">b1</span><span style="color:teal;font-weight:bold;">@</span> <span style="color:teal;">Fix bug</span><span style="color:teal;font-weight:bold;"> (current)</span> |
2414 <span style="color:teal;">s1</span><span style="font-weight:bold;color:teal;">@</span> <span style="color:teal;">Fix bug</span><span style="font-weight:bold;color:teal;"> (current)</span> |
2402 b0^ ROOT (base) |
2415 s0^ ROOT (base) |
2403 |
2416 |
2404 $ hg update build/linuxsupport-v2 |
2417 $ hg update build/linuxsupport-v2 |
2405 4 files updated, 0 files merged, 1 files removed, 0 files unresolved |
2418 4 files updated, 0 files merged, 1 files removed, 0 files unresolved |
2406 |
2419 |
2407 $ html_output $TESTDIR/output/stack-rebase.log stack |
2420 $ html_output $TESTDIR/output/stack-rebase.log stack |
2408 ### target: build/linuxsupport-v2 (branch) |
2421 ### target: build/linuxsupport-v2 (branch) |
2409 <span style="color:teal;">b3</span><span style="color:teal;font-weight:bold;">@</span> <span style="color:teal;">Third commit on build/linuxsupport-v2</span><span style="color:teal;font-weight:bold;"> (current)</span> |
2422 <span style="color:teal;">s3</span><span style="font-weight:bold;color:teal;">@</span> <span style="color:teal;">Third commit on build/linuxsupport-v2</span><span style="font-weight:bold;color:teal;"> (current)</span> |
2410 <span style="color:olive;">b2</span><span style="color:green;">:</span> Second commit on build/linuxsupport-v2. |
2423 <span style="color:olive;">s2</span><span style="color:green;">:</span> Second commit on build/linuxsupport-v2. |
2411 <span style="color:olive;">b1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2 |
2424 <span style="color:olive;">s1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2 |
2412 b0^ New commit on build/v2 (base) |
2425 s0^ New commit on build/v2 (base) |
2413 |
2426 |
2414 $ html_output $TESTDIR/output/stack-rebase-prev-from-b3.log prev |
2427 $ html_output $TESTDIR/output/stack-rebase-prev-from-b3.log prev |
2415 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
2428 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
2416 [<span style="color:blue;">19</span>] Second commit on build/linuxsupport-v2. |
2429 [<span style="color:blue;">19</span>] Second commit on build/linuxsupport-v2. |
2417 |
2430 |
2418 $ html_output $TESTDIR/output/stack-rebase-stack-b2.log stack |
2431 $ html_output $TESTDIR/output/stack-rebase-stack-b2.log stack |
2419 ### target: build/linuxsupport-v2 (branch) |
2432 ### target: build/linuxsupport-v2 (branch) |
2420 <span style="color:olive;">b3</span><span style="color:green;">:</span> Third commit on build/linuxsupport-v2 |
2433 <span style="color:olive;">s3</span><span style="color:green;">:</span> Third commit on build/linuxsupport-v2 |
2421 <span style="color:teal;">b2</span><span style="color:teal;font-weight:bold;">@</span> <span style="color:teal;">Second commit on build/linuxsupport-v2.</span><span style="color:teal;font-weight:bold;"> (current)</span> |
2434 <span style="color:teal;">s2</span><span style="font-weight:bold;color:teal;">@</span> <span style="color:teal;">Second commit on build/linuxsupport-v2.</span><span style="font-weight:bold;color:teal;"> (current)</span> |
2422 <span style="color:olive;">b1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2 |
2435 <span style="color:olive;">s1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2 |
2423 b0^ New commit on build/v2 (base) |
2436 s0^ New commit on build/v2 (base) |
2424 |
2437 |
2425 $ html_output $TESTDIR/output/stack-rebase-next-from-b2.log next |
2438 $ html_output $TESTDIR/output/stack-rebase-next-from-b2.log next |
2426 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2439 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2427 [<span style="color:blue;">20</span>] Third commit on build/linuxsupport-v2 |
2440 [<span style="color:blue;">20</span>] Third commit on build/linuxsupport-v2 |
2428 |
2441 |
2429 $ html_output $TESTDIR/output/stack-rebase-export-b1.log export -r b1 |
2442 $ html_output $TESTDIR/output/stack-rebase-export-b1.log export -r s1 |
2430 # HG changeset patch |
2443 # HG changeset patch |
2431 # User Boris Feld <boris.feld@octobus.net> |
2444 # User Boris Feld <boris.feld@octobus.net> |
2432 # Date 1512661592 -3600 |
2445 # Date 1512661592 -3600 |
2433 # Thu Dec 07 16:46:32 2017 +0100 |
2446 # Thu Dec 07 16:46:32 2017 +0100 |
2434 # Branch build/linuxsupport-v2 |
2447 # Branch build/linuxsupport-v2 |
2435 # Node ID 7b62ce2c283e6fa23af1811efea529c30620196a |
2448 # Node ID 7b62ce2c283e6fa23af1811efea529c30620196a |
2436 # Parent 0e694460372ee8e9ca759c90f05a31f11eee34ac |
2449 # Parent 0e694460372ee8e9ca759c90f05a31f11eee34ac |
2437 First commit on build/linuxsupport-v2 |
2450 First commit on build/linuxsupport-v2 |
2438 |
2451 |
2439 $ html_output $TESTDIR/output/stack-rebase-update-b2.log update -r b2 |
2452 $ html_output $TESTDIR/output/stack-rebase-update-b2.log update -r s2 |
2440 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
2453 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
2441 |
2454 |
2442 $ html_output $TESTDIR/output/stack-rebase-stack-b2.log stack |
2455 $ html_output $TESTDIR/output/stack-rebase-stack-b2.log stack |
2443 ### target: build/linuxsupport-v2 (branch) |
2456 ### target: build/linuxsupport-v2 (branch) |
2444 <span style="color:olive;">b3</span><span style="color:green;">:</span> Third commit on build/linuxsupport-v2 |
2457 <span style="color:olive;">s3</span><span style="color:green;">:</span> Third commit on build/linuxsupport-v2 |
2445 <span style="color:teal;">b2</span><span style="color:teal;font-weight:bold;">@</span> <span style="color:teal;">Second commit on build/linuxsupport-v2.</span><span style="color:teal;font-weight:bold;"> (current)</span> |
2458 <span style="color:teal;">s2</span><span style="font-weight:bold;color:teal;">@</span> <span style="color:teal;">Second commit on build/linuxsupport-v2.</span><span style="font-weight:bold;color:teal;"> (current)</span> |
2446 <span style="color:olive;">b1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2 |
2459 <span style="color:olive;">s1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2 |
2447 b0^ New commit on build/v2 (base) |
2460 s0^ New commit on build/v2 (base) |
2448 |
2461 |
2449 |
2462 |
2450 Edit mid-stack |
2463 Edit mid-stack |
2451 -------------- |
2464 -------------- |
2452 |
2465 |
2453 $ html_output $TESTDIR/output/edit-mid-stack.log amend -m "Second commit on build/linuxsupport-v2" |
2466 $ html_output $TESTDIR/output/edit-mid-stack.log amend -m "Second commit on build/linuxsupport-v2" |
2454 1 new orphan changesets |
2467 1 new orphan changesets |
2455 |
2468 |
2456 $ html_output $TESTDIR/output/edit-mid-stack-after-stack.log stack |
2469 $ html_output $TESTDIR/output/edit-mid-stack-after-stack.log stack |
2457 ### target: build/linuxsupport-v2 (branch) |
2470 ### target: build/linuxsupport-v2 (branch) |
2458 <span style="color:olive;">b3</span><span style="color:red;">$</span> Third commit on build/linuxsupport-v2<span style="color:red;"> (orphan)</span> |
2471 <span style="color:olive;">s3</span><span style="color:red;">$</span> Third commit on build/linuxsupport-v2<span style="color:red;"> (orphan)</span> |
2459 <span style="color:teal;">b2</span><span style="color:teal;font-weight:bold;">@</span> <span style="color:teal;">Second commit on build/linuxsupport-v2</span><span style="color:teal;font-weight:bold;"> (current)</span> |
2472 <span style="color:teal;">s2</span><span style="font-weight:bold;color:teal;">@</span> <span style="color:teal;">Second commit on build/linuxsupport-v2</span><span style="font-weight:bold;color:teal;"> (current)</span> |
2460 <span style="color:olive;">b1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2 |
2473 <span style="color:olive;">s1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2 |
2461 b0^ New commit on build/v2 (base) |
2474 s0^ New commit on build/v2 (base) |
2462 |
2475 |
2463 $ html_output $TESTDIR/output/edit-mid-stack-after-log.log log -r "branch(build/linuxsupport-v2)" -G |
2476 $ html_output $TESTDIR/output/edit-mid-stack-after-log.log log -r "branch(build/linuxsupport-v2)" -G |
2464 @ <span style="color:olive;">changeset: 31:5c069dd03e05</span> |
2477 @ <span style="color:olive;">changeset: 31:5c069dd03e05</span> |
2465 | branch: build/linuxsupport-v2 |
2478 | branch: build/linuxsupport-v2 |
2466 | tag: tip |
2479 | tag: tip |
2467 | parent: 18:7b62ce2c283e |
2480 | parent: 18:7b62ce2c283e |
2468 | user: Boris Feld <boris.feld@octobus.net> |
2481 | user: Boris Feld <boris.feld@octobus.net> |
2469 | date: Mon Dec 11 11:20:24 2017 +0100 |
2482 | date: Mon Dec 11 11:20:24 2017 +0100 |
2470 | summary: Second commit on build/linuxsupport-v2 |
2483 | summary: Second commit on build/linuxsupport-v2 |
2471 | |
2484 | |
2472 | o <span style="color:olive;">changeset: 20:3d2c8a2356a2</span> |
2485 | * <span style="color:olive;">changeset: 20:3d2c8a2356a2</span> |
2473 | | branch: build/linuxsupport-v2 |
2486 | | branch: build/linuxsupport-v2 |
2474 | | user: Boris Feld <boris.feld@octobus.net> |
2487 | | user: Boris Feld <boris.feld@octobus.net> |
2475 | | date: Mon Dec 11 11:21:02 2017 +0100 |
2488 | | date: Mon Dec 11 11:21:02 2017 +0100 |
2476 | | instability: orphan |
2489 | | instability: orphan |
2477 | | summary: Third commit on build/linuxsupport-v2 |
2490 | | summary: Third commit on build/linuxsupport-v2 |
2498 strict digraph "Mercurial graph" { |
2511 strict digraph "Mercurial graph" { |
2499 graph [rankdir=LR, |
2512 graph [rankdir=LR, |
2500 splines=polyline |
2513 splines=polyline |
2501 ]; |
2514 ]; |
2502 node [label="\N"]; |
2515 node [label="\N"]; |
2503 18 [fillcolor="#7F7FFF", |
2516 18 [fillcolor="#7F7FFF", |
2504 fixedsize=true, |
2517 fixedsize=true, |
2505 group="build/linuxsupport-v2", |
2518 group="build/linuxsupport-v2", |
2506 height=1, |
2519 height=1, |
2507 label="7b62ce2c", |
2520 label="7b62ce2c", |
2508 pin=true, |
2521 pin=true, |
2509 pos="1,18!", |
2522 pos="1,18!", |
2510 shape=circle, |
2523 shape=circle, |
2511 style=filled, |
2524 style=filled, |
2512 width=1]; |
2525 width=1]; |
2513 19 [fillcolor="#DFDFFF", |
2526 19 [fillcolor="#DFDFFF", |
2514 fixedsize=true, |
2527 fixedsize=true, |
2515 group="build/linuxsupport-v2_alt", |
2528 group="build/linuxsupport-v2_alt", |
2516 height=1, |
2529 height=1, |
2517 label=46863783, |
2530 label=46863783, |
2518 pin=true, |
2531 pin=true, |
2519 pos="2,19!", |
2532 pos="2,19!", |
2520 shape=circle, |
2533 shape=circle, |
2521 style="dotted, filled", |
2534 style="dotted, filled", |
2522 width=1]; |
2535 width=1]; |
2523 18 -> 19 [penwidth=2.0]; |
2536 18 -> 19 [penwidth=2.0]; |
2524 31 [fillcolor="#7F7FFF", |
2537 31 [fillcolor="#7F7FFF", |
2525 fixedsize=true, |
2538 fixedsize=true, |
2526 group="build/linuxsupport-v2", |
2539 group="build/linuxsupport-v2", |
2527 height=1, |
2540 height=1, |
2528 label="5c069dd0", |
2541 label="5c069dd0", |
2529 pin=true, |
2542 pin=true, |
2530 pos="1,31!", |
2543 pos="1,31!", |
2531 shape=circle, |
2544 shape=circle, |
2532 style=filled, |
2545 style=filled, |
2533 width=1]; |
2546 width=1]; |
2534 18 -> 31 [penwidth=2.0]; |
2547 18 -> 31 [penwidth=2.0]; |
2535 19 -> 31 [arrowtail=dot, |
2548 19 -> 31 [arrowtail=dot, |
2536 dir=back, |
2549 dir=back, |
2537 minlen=0, |
2550 minlen=0, |
2538 penwidth=2.0, |
2551 penwidth=2.0, |
2539 style=dashed]; |
2552 style=dashed]; |
2540 20 [fillcolor="#FF4F4F", |
2553 20 [fillcolor="#FF4F4F", |
2541 fixedsize=true, |
2554 fixedsize=true, |
2542 group="build/linuxsupport-v2_alt", |
2555 group="build/linuxsupport-v2_alt", |
2543 height=1, |
2556 height=1, |
2544 label="3d2c8a23", |
2557 label="3d2c8a23", |
2545 pin=true, |
2558 pin=true, |
2546 pos="2,20!", |
2559 pos="2,20!", |
2547 shape=circle, |
2560 shape=circle, |
2548 style=filled, |
2561 style=filled, |
2549 width=1]; |
2562 width=1]; |
2550 19 -> 20 [penwidth=2.0]; |
2563 19 -> 20 [penwidth=2.0]; |
2551 } |
2564 } |
2552 |
2565 |
2553 Basic instability + stabilization |
2566 Basic instability + stabilization |
2554 ------------------------------ |
2567 ------------------------------ |
2555 |
2568 |
2556 $ cp -R $TESTTMP/evolve_training_repo $TESTDIR/base-repos/edit-mid-stack/ |
2569 $ cp -R $TESTTMP/evolve_training_repo $TESTDIR/base-repos/edit-mid-stack/ |
2557 |
2570 |
2558 $ html_output $TESTDIR/output/basic-stabilize-before-log-obsolete.log log -r "branch(build/linuxsupport-v2)" -G -T "{node|short}: {obsolete}\n" |
2571 $ html_output $TESTDIR/output/basic-stabilize-before-log-obsolete.log log -r "branch(build/linuxsupport-v2)" -G -T "{node|short}: {obsolete}\n" |
2559 @ 5c069dd03e05: |
2572 @ 5c069dd03e05: |
2560 | |
2573 | |
2561 | o 3d2c8a2356a2: |
2574 | * 3d2c8a2356a2: |
2562 | | |
2575 | | |
2563 | x 4686378320d7: obsolete |
2576 | x 4686378320d7: obsolete |
2564 |/ |
2577 |/ |
2565 o 7b62ce2c283e: |
2578 o 7b62ce2c283e: |
2566 | |
2579 | |
2567 ~ |
2580 ~ |
2568 |
2581 |
2569 $ html_output $TESTDIR/output/basic-stabilize-before-log-instabilities.log log -r "branch(build/linuxsupport-v2)" -G -T "{node|short}: {instabilities}\n" |
2582 $ html_output $TESTDIR/output/basic-stabilize-before-log-instabilities.log log -r "branch(build/linuxsupport-v2)" -G -T "{node|short}: {instabilities}\n" |
2570 @ 5c069dd03e05: |
2583 @ 5c069dd03e05: |
2571 | |
2584 | |
2572 | o 3d2c8a2356a2: orphan |
2585 | * 3d2c8a2356a2: orphan |
2573 | | |
2586 | | |
2574 | x 4686378320d7: |
2587 | x 4686378320d7: |
2575 |/ |
2588 |/ |
2576 o 7b62ce2c283e: |
2589 o 7b62ce2c283e: |
2577 | |
2590 | |
2580 $ html_output $TESTDIR/output/basic-stabilize-before-evolve-list.log evolve --list |
2593 $ html_output $TESTDIR/output/basic-stabilize-before-evolve-list.log evolve --list |
2581 3d2c8a2356a2: Third commit on build/linuxsupport-v2 |
2594 3d2c8a2356a2: Third commit on build/linuxsupport-v2 |
2582 orphan: 4686378320d7 (obsolete parent) |
2595 orphan: 4686378320d7 (obsolete parent) |
2583 |
2596 |
2584 $ html_output $TESTDIR/output/basic-stabilize-next-evolve.log next --evolve |
2597 $ html_output $TESTDIR/output/basic-stabilize-next-evolve.log next --evolve |
2585 move:[<span style="color:blue;">20</span>] Third commit on build/linuxsupport-v2 |
2598 <span style="font-weight:bold;">move:</span>[<span style="color:blue;">20</span>] Third commit on build/linuxsupport-v2 |
2586 atop:[<span style="color:blue;">31</span>] Second commit on build/linuxsupport-v2 |
2599 atop:[<span style="color:blue;">31</span>] Second commit on build/linuxsupport-v2 |
2587 working directory now at <span style="color:olive;">52e790f9d4c3</span> |
2600 working directory is now at <span style="color:olive;">52e790f9d4c3</span> |
2588 |
2601 |
2589 $ html_output $TESTDIR/output/basic-stabilize-after-stack.log stack |
2602 $ html_output $TESTDIR/output/basic-stabilize-after-stack.log stack |
2590 ### target: build/linuxsupport-v2 (branch) |
2603 ### target: build/linuxsupport-v2 (branch) |
2591 <span style="color:teal;">b3</span><span style="color:teal;font-weight:bold;">@</span> <span style="color:teal;">Third commit on build/linuxsupport-v2</span><span style="color:teal;font-weight:bold;"> (current)</span> |
2604 <span style="color:teal;">s3</span><span style="font-weight:bold;color:teal;">@</span> <span style="color:teal;">Third commit on build/linuxsupport-v2</span><span style="font-weight:bold;color:teal;"> (current)</span> |
2592 <span style="color:olive;">b2</span><span style="color:green;">:</span> Second commit on build/linuxsupport-v2 |
2605 <span style="color:olive;">s2</span><span style="color:green;">:</span> Second commit on build/linuxsupport-v2 |
2593 <span style="color:olive;">b1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2 |
2606 <span style="color:olive;">s1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2 |
2594 b0^ New commit on build/v2 (base) |
2607 s0^ New commit on build/v2 (base) |
2595 |
2608 |
2596 $ graph $TESTDIR/graphs/basic-stabilize-after-stack.dot -T "{shortest(node, 8)}" -r "(::. + ::predecessors(.)) and branch(build/linuxsupport-v2)" --hidden --public=yes |
2609 $ graph $TESTDIR/graphs/basic-stabilize-after-stack.dot -T "{shortest(node, 8)}" -r "(::. + ::predecessors(.)) and branch(build/linuxsupport-v2)" --hidden --public=yes |
2597 Wrote */graphs/basic-stabilize-after-stack.dot (glob) |
2610 Wrote */graphs/basic-stabilize-after-stack.dot (glob) |
2598 .. graphviz:: |
2611 .. graphviz:: |
2599 |
2612 |
2600 strict digraph "Mercurial graph" { |
2613 strict digraph "Mercurial graph" { |
2601 graph [rankdir=LR, |
2614 graph [rankdir=LR, |
2602 splines=polyline |
2615 splines=polyline |
2603 ]; |
2616 ]; |
2604 node [label="\N"]; |
2617 node [label="\N"]; |
2605 18 [fillcolor="#7F7FFF", |
2618 18 [fillcolor="#7F7FFF", |
2606 fixedsize=true, |
2619 fixedsize=true, |
2607 group="build/linuxsupport-v2", |
2620 group="build/linuxsupport-v2", |
2608 height=1, |
2621 height=1, |
2609 label="7b62ce2c", |
2622 label="7b62ce2c", |
2610 pin=true, |
2623 pin=true, |
2611 pos="1,18!", |
2624 pos="1,18!", |
2612 shape=circle, |
2625 shape=circle, |
2613 style=filled, |
2626 style=filled, |
2614 width=1]; |
2627 width=1]; |
2615 31 [fillcolor="#7F7FFF", |
2628 31 [fillcolor="#7F7FFF", |
2616 fixedsize=true, |
2629 fixedsize=true, |
2617 group="build/linuxsupport-v2", |
2630 group="build/linuxsupport-v2", |
2618 height=1, |
2631 height=1, |
2619 label="5c069dd0", |
2632 label="5c069dd0", |
2620 pin=true, |
2633 pin=true, |
2621 pos="1,31!", |
2634 pos="1,31!", |
2622 shape=circle, |
2635 shape=circle, |
2623 style=filled, |
2636 style=filled, |
2624 width=1]; |
2637 width=1]; |
2625 18 -> 31 [penwidth=2.0]; |
2638 18 -> 31 [penwidth=2.0]; |
2626 19 [fillcolor="#DFDFFF", |
2639 19 [fillcolor="#DFDFFF", |
2627 fixedsize=true, |
2640 fixedsize=true, |
2628 group="build/linuxsupport-v2_extinct", |
2641 group="build/linuxsupport-v2_extinct", |
2629 height=1, |
2642 height=1, |
2630 label=46863783, |
2643 label=46863783, |
2631 pin=true, |
2644 pin=true, |
2632 pos="2,19!", |
2645 pos="2,19!", |
2633 shape=circle, |
2646 shape=circle, |
2634 style="dotted, filled", |
2647 style="dotted, filled", |
2635 width=1]; |
2648 width=1]; |
2636 18 -> 19 [penwidth=2.0]; |
2649 18 -> 19 [penwidth=2.0]; |
2637 32 [fillcolor="#7F7FFF", |
2650 32 [fillcolor="#7F7FFF", |
2638 fixedsize=true, |
2651 fixedsize=true, |
2639 group="build/linuxsupport-v2", |
2652 group="build/linuxsupport-v2", |
2640 height=1, |
2653 height=1, |
2641 label="52e790f9", |
2654 label="52e790f9", |
2642 pin=true, |
2655 pin=true, |
2643 pos="1,32!", |
2656 pos="1,32!", |
2644 shape=circle, |
2657 shape=circle, |
2645 style=filled, |
2658 style=filled, |
2646 width=1]; |
2659 width=1]; |
2647 31 -> 32 [penwidth=2.0]; |
2660 31 -> 32 [penwidth=2.0]; |
2648 19 -> 31 [arrowtail=dot, |
2661 19 -> 31 [arrowtail=dot, |
2649 dir=back, |
2662 dir=back, |
2650 minlen=0, |
2663 minlen=0, |
2651 penwidth=2.0, |
2664 penwidth=2.0, |
2652 style=dashed]; |
2665 style=dashed]; |
2653 20 [fillcolor="#DFDFFF", |
2666 20 [fillcolor="#DFDFFF", |
2654 fixedsize=true, |
2667 fixedsize=true, |
2655 group="build/linuxsupport-v2_extinct", |
2668 group="build/linuxsupport-v2_extinct", |
2656 height=1, |
2669 height=1, |
2657 label="3d2c8a23", |
2670 label="3d2c8a23", |
2658 pin=true, |
2671 pin=true, |
2659 pos="2,20!", |
2672 pos="2,20!", |
2660 shape=circle, |
2673 shape=circle, |
2661 style="dotted, filled", |
2674 style="dotted, filled", |
2662 width=1]; |
2675 width=1]; |
2663 19 -> 20 [penwidth=2.0]; |
2676 19 -> 20 [penwidth=2.0]; |
2664 20 -> 32 [arrowtail=dot, |
2677 20 -> 32 [arrowtail=dot, |
2665 dir=back, |
2678 dir=back, |
2666 minlen=0, |
2679 minlen=0, |
2667 penwidth=2.0, |
2680 penwidth=2.0, |
2668 style=dashed]; |
2681 style=dashed]; |
2669 } |
2682 } |
2854 | | | | x changeset: 23:008eb7da195a |
2867 | | | | x changeset: 23:008eb7da195a |
2855 | | | |/ branch: amend-extract |
2868 | | | |/ branch: amend-extract |
2856 | | | | parent: 7:4ae0d1de7a58 |
2869 | | | | parent: 7:4ae0d1de7a58 |
2857 | | | | user: Good User |
2870 | | | | user: Good User |
2858 | | | | date: Fri Dec 08 15:28:46 2017 +0100 |
2871 | | | | date: Fri Dec 08 15:28:46 2017 +0100 |
2859 | | | | obsolete: pruned |
2872 | | | | obsolete: pruned using uncommit |
2860 | | | | summary: temporary commit for uncommiting 1e04751ef00a |
2873 | | | | summary: temporary commit for uncommiting 1e04751ef00a |
2861 | | | | |
2874 | | | | |
2862 | | | | x changeset: 22:1e04751ef00a |
2875 | | | | x changeset: 22:1e04751ef00a |
2863 | | | |/ branch: amend-extract |
2876 | | | |/ branch: amend-extract |
2864 | | | | parent: 7:4ae0d1de7a58 |
2877 | | | | parent: 7:4ae0d1de7a58 |
2865 | | | | user: Good User |
2878 | | | | user: Good User |
2866 | | | | date: Fri Dec 08 15:28:46 2017 +0100 |
2879 | | | | date: Fri Dec 08 15:28:46 2017 +0100 |
2867 | | | | obsolete: amended as 24:76ace846a3f9 |
2880 | | | | obsolete: amended using uncommit as 24:76ace846a3f9 |
2868 | | | | summary: Commit to be extracted |
2881 | | | | summary: Commit to be extracted |
2869 | | | | |
2882 | | | | |
2870 | | | | x changeset: 21:5935c1c3ad24 |
2883 | | | | x changeset: 21:5935c1c3ad24 |
2871 | | | |/ branch: amend-extract |
2884 | | | |/ branch: amend-extract |
2872 | | | | parent: 7:4ae0d1de7a58 |
2885 | | | | parent: 7:4ae0d1de7a58 |
2873 | | | | user: Good User |
2886 | | | | user: Good User |
2874 | | | | date: Fri Dec 08 15:28:46 2017 +0100 |
2887 | | | | date: Fri Dec 08 15:28:46 2017 +0100 |
2875 | | | | obsolete: amended as 22:1e04751ef00a |
2888 | | | | obsolete: amended using uncommit as 22:1e04751ef00a |
2876 | | | | summary: Commit to be extracted |
2889 | | | | summary: Commit to be extracted |
2877 | | | | |
2890 | | | | |
2878 | | | | x changeset: 20:3d2c8a2356a2 |
2891 | | | | x changeset: 20:3d2c8a2356a2 |
2879 | | | | | branch: build/linuxsupport-v2 |
2892 | | | | | branch: build/linuxsupport-v2 |
2880 | | | | | user: Boris Feld <boris.feld@octobus.net> |
2893 | | | | | user: Boris Feld <boris.feld@octobus.net> |
2881 | | | | | date: Mon Dec 11 11:21:02 2017 +0100 |
2894 | | | | | date: Mon Dec 11 11:21:02 2017 +0100 |
2882 | | | | | obsolete: rebased as 32:52e790f9d4c3 |
2895 | | | | | obsolete: rebased using evolve as 32:52e790f9d4c3 |
2883 | | | | | summary: Third commit on build/linuxsupport-v2 |
2896 | | | | | summary: Third commit on build/linuxsupport-v2 |
2884 | | | | | |
2897 | | | | | |
2885 +-------x changeset: 19:4686378320d7 |
2898 +-------x changeset: 19:4686378320d7 |
2886 | | | | branch: build/linuxsupport-v2 |
2899 | | | | branch: build/linuxsupport-v2 |
2887 | | | | user: Boris Feld <boris.feld@octobus.net> |
2900 | | | | user: Boris Feld <boris.feld@octobus.net> |
2927 | +---x changeset: 13:5d5029b9daed |
2940 | +---x changeset: 13:5d5029b9daed |
2928 | | | branch: split |
2941 | | | branch: split |
2929 | | | parent: 0:d2eb2ac6a5bd |
2942 | | | parent: 0:d2eb2ac6a5bd |
2930 | | | user: Boris Feld <boris.feld@octobus.net> |
2943 | | | user: Boris Feld <boris.feld@octobus.net> |
2931 | | | date: Fri Dec 08 17:33:15 2017 +0100 |
2944 | | | date: Fri Dec 08 17:33:15 2017 +0100 |
2932 | | | obsolete: split as 26:59f0ddc4bd4b, 27:6fb7bfb44ffe, 28:1b7281b1e052 |
2945 | | | obsolete: split using split as 26:59f0ddc4bd4b, 27:6fb7bfb44ffe, 28:1b7281b1e052 |
2933 | | | summary: To be splitted |
2946 | | | summary: To be splitted |
2934 | | | |
2947 | | | |
2935 | | | x changeset: 12:966df9f031c1 |
2948 | | | x changeset: 12:966df9f031c1 |
2936 | | | | branch: fold |
2949 | | | | branch: fold |
2937 | | | | user: Boris Feld <boris.feld@octobus.net> |
2950 | | | | user: Boris Feld <boris.feld@octobus.net> |
2938 | | | | date: Fri Dec 08 16:50:38 2017 +0100 |
2951 | | | | date: Fri Dec 08 16:50:38 2017 +0100 |
2939 | | | | obsolete: rewritten as 25:dab6ed4b3c75 |
2952 | | | | obsolete: rewritten using fold as 25:dab6ed4b3c75 |
2940 | | | | summary: Really fix the test |
2953 | | | | summary: Really fix the test |
2941 | | | | |
2954 | | | | |
2942 | | | x changeset: 11:b316dc02bddc |
2955 | | | x changeset: 11:b316dc02bddc |
2943 | | | | branch: fold |
2956 | | | | branch: fold |
2944 | | | | user: Boris Feld <boris.feld@octobus.net> |
2957 | | | | user: Boris Feld <boris.feld@octobus.net> |
2945 | | | | date: Fri Dec 08 16:50:17 2017 +0100 |
2958 | | | | date: Fri Dec 08 16:50:17 2017 +0100 |
2946 | | | | obsolete: rewritten as 25:dab6ed4b3c75 |
2959 | | | | obsolete: rewritten using fold as 25:dab6ed4b3c75 |
2947 | | | | summary: Fix the test |
2960 | | | | summary: Fix the test |
2948 | | | | |
2961 | | | | |
2949 | +---x changeset: 10:03174536bb2a |
2962 | +---x changeset: 10:03174536bb2a |
2950 | | | branch: fold |
2963 | | | branch: fold |
2951 | | | parent: 0:d2eb2ac6a5bd |
2964 | | | parent: 0:d2eb2ac6a5bd |
2952 | | | user: Boris Feld <boris.feld@octobus.net> |
2965 | | | user: Boris Feld <boris.feld@octobus.net> |
2953 | | | date: Fri Dec 08 16:49:45 2017 +0100 |
2966 | | | date: Fri Dec 08 16:49:45 2017 +0100 |
2954 | | | obsolete: rewritten as 25:dab6ed4b3c75 |
2967 | | | obsolete: rewritten using fold as 25:dab6ed4b3c75 |
2955 | | | summary: add a test |
2968 | | | summary: add a test |
2956 | | | |
2969 | | | |
2957 | +---x changeset: 9:324b72ebbb21 |
2970 | +---x changeset: 9:324b72ebbb21 |
2958 | | | branch: prune |
2971 | | | branch: prune |
2959 | | | parent: 0:d2eb2ac6a5bd |
2972 | | | parent: 0:d2eb2ac6a5bd |
2960 | | | user: Boris Feld <boris.feld@octobus.net> |
2973 | | | user: Boris Feld <boris.feld@octobus.net> |
2961 | | | date: Fri Dec 08 16:12:23 2017 +0100 |
2974 | | | date: Fri Dec 08 16:12:23 2017 +0100 |
2962 | | | obsolete: pruned |
2975 | | | obsolete: pruned using prune |
2963 | | | summary: Commit to prune |
2976 | | | summary: Commit to prune |
2964 | | | |
2977 | | | |
2965 | | | x changeset: 8:e288d12d5e96 |
2978 | | | x changeset: 8:e288d12d5e96 |
2966 | | |/ branch: amend-extract |
2979 | | |/ branch: amend-extract |
2967 | | | user: Bad User |
2980 | | | user: Bad User |