| changeset 35508 | 9b3f95d9783d |
| parent 35393 | 4441705b7111 |
| child 35518 | 02fdb8c018aa |
| 35507:95a9be56c3bb | 35508:9b3f95d9783d |
|---|---|
818 | user: test |
818 | user: test |
819 | date: Thu Jan 01 00:00:00 1970 +0000 |
819 | date: Thu Jan 01 00:00:00 1970 +0000 |
820 | instability: content-divergent |
820 | instability: content-divergent |
821 | summary: A2 |
821 | summary: A2 |
822 | |
822 | |
823 | o changeset: 2:fdf9bde5129a |
823 | * changeset: 2:fdf9bde5129a |
824 |/ parent: 0:ea207398892e |
824 |/ parent: 0:ea207398892e |
825 | user: test |
825 | user: test |
826 | date: Thu Jan 01 00:00:00 1970 +0000 |
826 | date: Thu Jan 01 00:00:00 1970 +0000 |
827 | instability: content-divergent |
827 | instability: content-divergent |
828 | summary: A1 |
828 | summary: A1 |
854 | user: test |
854 | user: test |
855 | date: Thu Jan 01 00:00:00 1970 +0000 |
855 | date: Thu Jan 01 00:00:00 1970 +0000 |
856 | obsolete: rewritten using amend as 4:019fadeab383 |
856 | obsolete: rewritten using amend as 4:019fadeab383 |
857 | summary: A2 |
857 | summary: A2 |
858 | |
858 | |
859 | o changeset: 2:fdf9bde5129a |
859 | * changeset: 2:fdf9bde5129a |
860 |/ parent: 0:ea207398892e |
860 |/ parent: 0:ea207398892e |
861 | user: test |
861 | user: test |
862 | date: Thu Jan 01 00:00:00 1970 +0000 |
862 | date: Thu Jan 01 00:00:00 1970 +0000 |
863 | instability: content-divergent |
863 | instability: content-divergent |
864 | summary: A1 |
864 | summary: A1 |
882 $ hg up 'desc(A0)' --hidden |
882 $ hg up 'desc(A0)' --hidden |
883 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
883 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
884 |
884 |
885 Predecessors template should show current revision as it is the working copy |
885 Predecessors template should show current revision as it is the working copy |
886 $ hg tlog |
886 $ hg tlog |
887 o 019fadeab383 |
887 * 019fadeab383 |
888 | Predecessors: 1:471f378eab4c |
888 | Predecessors: 1:471f378eab4c |
889 | semi-colon: 1:471f378eab4c |
889 | semi-colon: 1:471f378eab4c |
890 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
890 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
891 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
891 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
892 | o fdf9bde5129a |
892 | * fdf9bde5129a |
893 |/ Predecessors: 1:471f378eab4c |
893 |/ Predecessors: 1:471f378eab4c |
894 | semi-colon: 1:471f378eab4c |
894 | semi-colon: 1:471f378eab4c |
895 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
895 | json: ["471f378eab4c5e25f6c77f785b27c936efb22874"] |
896 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
896 | map: 1:471f378eab4c5e25f6c77f785b27c936efb22874 |
897 | @ 471f378eab4c |
897 | @ 471f378eab4c |
900 | multi-line: 4:019fadeab383 |
900 | multi-line: 4:019fadeab383 |
901 | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]] |
901 | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]] |
902 o ea207398892e |
902 o ea207398892e |
903 |
903 |
904 $ hg fatelog |
904 $ hg fatelog |
905 o 019fadeab383 |
905 * 019fadeab383 |
906 | |
906 | |
907 | o fdf9bde5129a |
907 | * fdf9bde5129a |
908 |/ |
908 |/ |
909 | @ 471f378eab4c |
909 | @ 471f378eab4c |
910 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000); |
910 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000); |
911 o ea207398892e |
911 o ea207398892e |
912 |
912 |
914 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
914 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
915 |
915 |
916 Predecessors template should not show predecessors as they are not displayed in |
916 Predecessors template should not show predecessors as they are not displayed in |
917 the log |
917 the log |
918 $ hg tlog |
918 $ hg tlog |
919 o 019fadeab383 |
919 * 019fadeab383 |
920 | |
920 | |
921 | @ fdf9bde5129a |
921 | @ fdf9bde5129a |
922 |/ |
922 |/ |
923 o ea207398892e |
923 o ea207398892e |
924 |
924 |
925 |
925 |
926 $ hg fatelog |
926 $ hg fatelog |
927 o 019fadeab383 |
927 * 019fadeab383 |
928 | |
928 | |
929 | @ fdf9bde5129a |
929 | @ fdf9bde5129a |
930 |/ |
930 |/ |
931 o ea207398892e |
931 o ea207398892e |
932 |
932 |
933 Predecessors template should the predecessors as we force their display with |
933 Predecessors template should the predecessors as we force their display with |
934 --hidden |
934 --hidden |
935 $ hg tlog --hidden |
935 $ hg tlog --hidden |
936 o 019fadeab383 |
936 * 019fadeab383 |
937 | Predecessors: 3:65b757b745b9 |
937 | Predecessors: 3:65b757b745b9 |
938 | semi-colon: 3:65b757b745b9 |
938 | semi-colon: 3:65b757b745b9 |
939 | json: ["65b757b745b935093c87a2bccd877521cccffcbd"] |
939 | json: ["65b757b745b935093c87a2bccd877521cccffcbd"] |
940 | map: 3:65b757b745b935093c87a2bccd877521cccffcbd |
940 | map: 3:65b757b745b935093c87a2bccd877521cccffcbd |
941 | x 65b757b745b9 |
941 | x 65b757b745b9 |
958 | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["65b757b745b935093c87a2bccd877521cccffcbd"]] |
958 | json: [["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], ["65b757b745b935093c87a2bccd877521cccffcbd"]] |
959 o ea207398892e |
959 o ea207398892e |
960 |
960 |
961 |
961 |
962 $ hg fatelog --hidden |
962 $ hg fatelog --hidden |
963 o 019fadeab383 |
963 * 019fadeab383 |
964 | |
964 | |
965 | x 65b757b745b9 |
965 | x 65b757b745b9 |
966 |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000); |
966 |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000); |
967 | @ fdf9bde5129a |
967 | @ fdf9bde5129a |
968 |/ |
968 |/ |
970 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000); |
970 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000); |
971 o ea207398892e |
971 o ea207398892e |
972 |
972 |
973 |
973 |
974 $ hg fatelogjson --hidden |
974 $ hg fatelogjson --hidden |
975 o 019fadeab383 |
975 * 019fadeab383 |
976 | |
976 | |
977 | x 65b757b745b9 |
977 | x 65b757b745b9 |
978 |/ Obsfate: [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]}] |
978 |/ Obsfate: [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]}] |
979 | @ fdf9bde5129a |
979 | @ fdf9bde5129a |
980 |/ |
980 |/ |
985 |
985 |
986 Check other fatelog implementations |
986 Check other fatelog implementations |
987 ----------------------------------- |
987 ----------------------------------- |
988 |
988 |
989 $ hg fatelogkw --hidden -q |
989 $ hg fatelogkw --hidden -q |
990 o 019fadeab383 |
990 * 019fadeab383 |
991 | |
991 | |
992 | x 65b757b745b9 |
992 | x 65b757b745b9 |
993 |/ Obsfate: rewritten using amend as 4:019fadeab383 |
993 |/ Obsfate: rewritten using amend as 4:019fadeab383 |
994 | @ fdf9bde5129a |
994 | @ fdf9bde5129a |
995 |/ |
995 |/ |
997 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a |
997 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a |
998 | Obsfate: rewritten using amend as 3:65b757b745b9 |
998 | Obsfate: rewritten using amend as 3:65b757b745b9 |
999 o ea207398892e |
999 o ea207398892e |
1000 |
1000 |
1001 $ hg fatelogkw --hidden |
1001 $ hg fatelogkw --hidden |
1002 o 019fadeab383 |
1002 * 019fadeab383 |
1003 | |
1003 | |
1004 | x 65b757b745b9 |
1004 | x 65b757b745b9 |
1005 |/ Obsfate: rewritten using amend as 4:019fadeab383 |
1005 |/ Obsfate: rewritten using amend as 4:019fadeab383 |
1006 | @ fdf9bde5129a |
1006 | @ fdf9bde5129a |
1007 |/ |
1007 |/ |
1009 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a |
1009 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a |
1010 | Obsfate: rewritten using amend as 3:65b757b745b9 |
1010 | Obsfate: rewritten using amend as 3:65b757b745b9 |
1011 o ea207398892e |
1011 o ea207398892e |
1012 |
1012 |
1013 $ hg fatelogkw --hidden -v |
1013 $ hg fatelogkw --hidden -v |
1014 o 019fadeab383 |
1014 * 019fadeab383 |
1015 | |
1015 | |
1016 | x 65b757b745b9 |
1016 | x 65b757b745b9 |
1017 |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000) |
1017 |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000) |
1018 | @ fdf9bde5129a |
1018 | @ fdf9bde5129a |
1019 |/ |
1019 |/ |
1021 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000) |
1021 |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000) |
1022 | Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000) |
1022 | Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000) |
1023 o ea207398892e |
1023 o ea207398892e |
1024 |
1024 |
1025 $ hg log -G -T "default" --hidden |
1025 $ hg log -G -T "default" --hidden |
1026 o changeset: 4:019fadeab383 |
1026 * changeset: 4:019fadeab383 |
1027 | tag: tip |
1027 | tag: tip |
1028 | parent: 0:ea207398892e |
1028 | parent: 0:ea207398892e |
1029 | user: test |
1029 | user: test |
1030 | date: Thu Jan 01 00:00:00 1970 +0000 |
1030 | date: Thu Jan 01 00:00:00 1970 +0000 |
1031 | instability: content-divergent |
1031 | instability: content-divergent |
1875 | user: test |
1875 | user: test |
1876 | date: Thu Jan 01 00:00:00 1970 +0000 |
1876 | date: Thu Jan 01 00:00:00 1970 +0000 |
1877 | instability: content-divergent |
1877 | instability: content-divergent |
1878 | summary: Add B only |
1878 | summary: Add B only |
1879 | |
1879 | |
1880 | o changeset: 8:b18bc8331526 |
1880 | * changeset: 8:b18bc8331526 |
1881 |/ parent: 5:dd800401bd8c |
1881 |/ parent: 5:dd800401bd8c |
1882 | user: test |
1882 | user: test |
1883 | date: Thu Jan 01 00:00:00 1970 +0000 |
1883 | date: Thu Jan 01 00:00:00 1970 +0000 |
1884 | instability: content-divergent |
1884 | instability: content-divergent |
1885 | summary: Add only B |
1885 | summary: Add only B |
1886 | |
1886 | |
1887 | o changeset: 7:ba2ed02b0c9a |
1887 | * changeset: 7:ba2ed02b0c9a |
1888 | | user: test |
1888 | | user: test |
1889 | | date: Thu Jan 01 00:00:00 1970 +0000 |
1889 | | date: Thu Jan 01 00:00:00 1970 +0000 |
1890 | | instability: orphan, content-divergent |
1890 | | instability: orphan, content-divergent |
1891 | | summary: Add A,B,C |
1891 | | summary: Add A,B,C |
1892 | | |
1892 | | |
1895 | date: Thu Jan 01 00:00:00 1970 +0000 |
1895 | date: Thu Jan 01 00:00:00 1970 +0000 |
1896 | obsolete: rewritten using amend as 8:b18bc8331526 |
1896 | obsolete: rewritten using amend as 8:b18bc8331526 |
1897 | obsolete: rewritten using amend as 9:0b997eb7ceee |
1897 | obsolete: rewritten using amend as 9:0b997eb7ceee |
1898 | summary: Add A,B,C |
1898 | summary: Add A,B,C |
1899 | |
1899 | |
1900 o changeset: 5:dd800401bd8c |
1900 * changeset: 5:dd800401bd8c |
1901 | parent: 3:f897c6137566 |
1901 | parent: 3:f897c6137566 |
1902 | user: test |
1902 | user: test |
1903 | date: Thu Jan 01 00:00:00 1970 +0000 |
1903 | date: Thu Jan 01 00:00:00 1970 +0000 |
1904 | instability: content-divergent |
1904 | instability: content-divergent |
1905 | summary: Add A,B,C |
1905 | summary: Add A,B,C |
1923 @ 0b997eb7ceee |
1923 @ 0b997eb7ceee |
1924 | Predecessors: 6:4a004186e638 |
1924 | Predecessors: 6:4a004186e638 |
1925 | semi-colon: 6:4a004186e638 |
1925 | semi-colon: 6:4a004186e638 |
1926 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
1926 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
1927 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
1927 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
1928 | o b18bc8331526 |
1928 | * b18bc8331526 |
1929 |/ Predecessors: 6:4a004186e638 |
1929 |/ Predecessors: 6:4a004186e638 |
1930 | semi-colon: 6:4a004186e638 |
1930 | semi-colon: 6:4a004186e638 |
1931 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
1931 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
1932 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
1932 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
1933 | o ba2ed02b0c9a |
1933 | * ba2ed02b0c9a |
1934 | | |
1934 | | |
1935 | x 4a004186e638 |
1935 | x 4a004186e638 |
1936 |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee |
1936 |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee |
1937 | multi-line: 8:b18bc8331526 |
1937 | multi-line: 8:b18bc8331526 |
1938 | multi-line: 9:0b997eb7ceee |
1938 | multi-line: 9:0b997eb7ceee |
1939 | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]] |
1939 | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]] |
1940 o dd800401bd8c |
1940 * dd800401bd8c |
1941 | |
1941 | |
1942 o f897c6137566 |
1942 o f897c6137566 |
1943 | |
1943 | |
1944 o ea207398892e |
1944 o ea207398892e |
1945 |
1945 |
1946 $ hg fatelog |
1946 $ hg fatelog |
1947 @ 0b997eb7ceee |
1947 @ 0b997eb7ceee |
1948 | |
1948 | |
1949 | o b18bc8331526 |
1949 | * b18bc8331526 |
1950 |/ |
1950 |/ |
1951 | o ba2ed02b0c9a |
1951 | * ba2ed02b0c9a |
1952 | | |
1952 | | |
1953 | x 4a004186e638 |
1953 | x 4a004186e638 |
1954 |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000); |
1954 |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000); |
1955 o dd800401bd8c |
1955 * dd800401bd8c |
1956 | |
1956 | |
1957 o f897c6137566 |
1957 o f897c6137566 |
1958 | |
1958 | |
1959 o ea207398892e |
1959 o ea207398892e |
1960 |
1960 |
1962 @ 0b997eb7ceee |
1962 @ 0b997eb7ceee |
1963 | Predecessors: 6:4a004186e638 |
1963 | Predecessors: 6:4a004186e638 |
1964 | semi-colon: 6:4a004186e638 |
1964 | semi-colon: 6:4a004186e638 |
1965 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
1965 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
1966 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
1966 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
1967 | o b18bc8331526 |
1967 | * b18bc8331526 |
1968 |/ Predecessors: 6:4a004186e638 |
1968 |/ Predecessors: 6:4a004186e638 |
1969 | semi-colon: 6:4a004186e638 |
1969 | semi-colon: 6:4a004186e638 |
1970 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
1970 | json: ["4a004186e63889f20cb16434fcbd72220bd1eace"] |
1971 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
1971 | map: 6:4a004186e63889f20cb16434fcbd72220bd1eace |
1972 | o ba2ed02b0c9a |
1972 | * ba2ed02b0c9a |
1973 | | Predecessors: 4:9bd10a0775e4 |
1973 | | Predecessors: 4:9bd10a0775e4 |
1974 | | semi-colon: 4:9bd10a0775e4 |
1974 | | semi-colon: 4:9bd10a0775e4 |
1975 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
1975 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
1976 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
1976 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
1977 | x 4a004186e638 |
1977 | x 4a004186e638 |
1981 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
1981 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
1982 | Successors: 8:b18bc8331526; 9:0b997eb7ceee |
1982 | Successors: 8:b18bc8331526; 9:0b997eb7ceee |
1983 | multi-line: 8:b18bc8331526 |
1983 | multi-line: 8:b18bc8331526 |
1984 | multi-line: 9:0b997eb7ceee |
1984 | multi-line: 9:0b997eb7ceee |
1985 | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]] |
1985 | json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]] |
1986 o dd800401bd8c |
1986 * dd800401bd8c |
1987 | Predecessors: 4:9bd10a0775e4 |
1987 | Predecessors: 4:9bd10a0775e4 |
1988 | semi-colon: 4:9bd10a0775e4 |
1988 | semi-colon: 4:9bd10a0775e4 |
1989 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
1989 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
1990 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
1990 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
1991 | x 9bd10a0775e4 |
1991 | x 9bd10a0775e4 |
2017 o ea207398892e |
2017 o ea207398892e |
2018 |
2018 |
2019 $ hg fatelog --hidden |
2019 $ hg fatelog --hidden |
2020 @ 0b997eb7ceee |
2020 @ 0b997eb7ceee |
2021 | |
2021 | |
2022 | o b18bc8331526 |
2022 | * b18bc8331526 |
2023 |/ |
2023 |/ |
2024 | o ba2ed02b0c9a |
2024 | * ba2ed02b0c9a |
2025 | | |
2025 | | |
2026 | x 4a004186e638 |
2026 | x 4a004186e638 |
2027 |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000); |
2027 |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000); |
2028 o dd800401bd8c |
2028 * dd800401bd8c |
2029 | |
2029 | |
2030 | x 9bd10a0775e4 |
2030 | x 9bd10a0775e4 |
2031 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000); |
2031 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000); |
2032 o f897c6137566 |
2032 o f897c6137566 |
2033 | |
2033 | |
2038 o ea207398892e |
2038 o ea207398892e |
2039 |
2039 |
2040 $ hg fatelogjson --hidden |
2040 $ hg fatelogjson --hidden |
2041 @ 0b997eb7ceee |
2041 @ 0b997eb7ceee |
2042 | |
2042 | |
2043 | o b18bc8331526 |
2043 | * b18bc8331526 |
2044 |/ |
2044 |/ |
2045 | o ba2ed02b0c9a |
2045 | * ba2ed02b0c9a |
2046 | | |
2046 | | |
2047 | x 4a004186e638 |
2047 | x 4a004186e638 |
2048 |/ Obsfate: [{"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["b18bc8331526a22cbb1801022bd1555bf291c48b"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["b18bc8331526a22cbb1801022bd1555bf291c48b"]}, {"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["0b997eb7ceeee06200a02f8aab185979092d514e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["0b997eb7ceeee06200a02f8aab185979092d514e"]}] |
2048 |/ Obsfate: [{"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["b18bc8331526a22cbb1801022bd1555bf291c48b"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["b18bc8331526a22cbb1801022bd1555bf291c48b"]}, {"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["0b997eb7ceeee06200a02f8aab185979092d514e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["0b997eb7ceeee06200a02f8aab185979092d514e"]}] |
2049 o dd800401bd8c |
2049 * dd800401bd8c |
2050 | |
2050 | |
2051 | x 9bd10a0775e4 |
2051 | x 9bd10a0775e4 |
2052 |/ Obsfate: [{"markers": [["9bd10a0775e478708cada5f176ec6de654359ce7", ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]}] |
2052 |/ Obsfate: [{"markers": [["9bd10a0775e478708cada5f176ec6de654359ce7", ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]}] |
2053 o f897c6137566 |
2053 o f897c6137566 |
2054 | |
2054 | |
2061 $ hg up --hidden 4 |
2061 $ hg up --hidden 4 |
2062 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2062 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2063 $ hg rebase -r 7 -d 8 --config extensions.rebase= |
2063 $ hg rebase -r 7 -d 8 --config extensions.rebase= |
2064 rebasing 7:ba2ed02b0c9a "Add A,B,C" |
2064 rebasing 7:ba2ed02b0c9a "Add A,B,C" |
2065 $ hg tlog |
2065 $ hg tlog |
2066 o eceed8f98ffc |
2066 * eceed8f98ffc |
2067 | Predecessors: 4:9bd10a0775e4 |
2067 | Predecessors: 4:9bd10a0775e4 |
2068 | semi-colon: 4:9bd10a0775e4 |
2068 | semi-colon: 4:9bd10a0775e4 |
2069 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
2069 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
2070 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
2070 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
2071 | o 0b997eb7ceee |
2071 | * 0b997eb7ceee |
2072 | | Predecessors: 4:9bd10a0775e4 |
2072 | | Predecessors: 4:9bd10a0775e4 |
2073 | | semi-colon: 4:9bd10a0775e4 |
2073 | | semi-colon: 4:9bd10a0775e4 |
2074 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
2074 | | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
2075 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
2075 | | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
2076 o | b18bc8331526 |
2076 * | b18bc8331526 |
2077 |/ Predecessors: 4:9bd10a0775e4 |
2077 |/ Predecessors: 4:9bd10a0775e4 |
2078 | semi-colon: 4:9bd10a0775e4 |
2078 | semi-colon: 4:9bd10a0775e4 |
2079 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
2079 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
2080 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
2080 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
2081 o dd800401bd8c |
2081 * dd800401bd8c |
2082 | Predecessors: 4:9bd10a0775e4 |
2082 | Predecessors: 4:9bd10a0775e4 |
2083 | semi-colon: 4:9bd10a0775e4 |
2083 | semi-colon: 4:9bd10a0775e4 |
2084 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
2084 | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"] |
2085 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
2085 | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7 |
2086 | @ 9bd10a0775e4 |
2086 | @ 9bd10a0775e4 |
2092 | |
2092 | |
2093 o ea207398892e |
2093 o ea207398892e |
2094 |
2094 |
2095 |
2095 |
2096 $ hg fatelog |
2096 $ hg fatelog |
2097 o eceed8f98ffc |
2097 * eceed8f98ffc |
2098 | |
2098 | |
2099 | o 0b997eb7ceee |
2099 | * 0b997eb7ceee |
2100 | | |
2100 | | |
2101 o | b18bc8331526 |
2101 * | b18bc8331526 |
2102 |/ |
2102 |/ |
2103 o dd800401bd8c |
2103 * dd800401bd8c |
2104 | |
2104 | |
2105 | @ 9bd10a0775e4 |
2105 | @ 9bd10a0775e4 |
2106 |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); |
2106 |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); |
2107 o f897c6137566 |
2107 o f897c6137566 |
2108 | |
2108 | |
2110 |
2110 |
2111 Check other fatelog implementations |
2111 Check other fatelog implementations |
2112 ----------------------------------- |
2112 ----------------------------------- |
2113 |
2113 |
2114 $ hg fatelogkw --hidden -q |
2114 $ hg fatelogkw --hidden -q |
2115 o eceed8f98ffc |
2115 * eceed8f98ffc |
2116 | |
2116 | |
2117 | o 0b997eb7ceee |
2117 | * 0b997eb7ceee |
2118 | | |
2118 | | |
2119 o | b18bc8331526 |
2119 * | b18bc8331526 |
2120 |/ |
2120 |/ |
2121 | x ba2ed02b0c9a |
2121 | x ba2ed02b0c9a |
2122 | | Obsfate: rewritten using rebase as 10:eceed8f98ffc |
2122 | | Obsfate: rewritten using rebase as 10:eceed8f98ffc |
2123 | x 4a004186e638 |
2123 | x 4a004186e638 |
2124 |/ Obsfate: rewritten using amend as 8:b18bc8331526 |
2124 |/ Obsfate: rewritten using amend as 8:b18bc8331526 |
2125 | Obsfate: rewritten using amend as 9:0b997eb7ceee |
2125 | Obsfate: rewritten using amend as 9:0b997eb7ceee |
2126 o dd800401bd8c |
2126 * dd800401bd8c |
2127 | |
2127 | |
2128 | @ 9bd10a0775e4 |
2128 | @ 9bd10a0775e4 |
2129 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a |
2129 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a |
2130 o f897c6137566 |
2130 o f897c6137566 |
2131 | |
2131 | |
2135 | x 471f378eab4c |
2135 | x 471f378eab4c |
2136 |/ Obsfate: rewritten as 2:0dec01379d3b |
2136 |/ Obsfate: rewritten as 2:0dec01379d3b |
2137 o ea207398892e |
2137 o ea207398892e |
2138 |
2138 |
2139 $ hg fatelogkw --hidden |
2139 $ hg fatelogkw --hidden |
2140 o eceed8f98ffc |
2140 * eceed8f98ffc |
2141 | |
2141 | |
2142 | o 0b997eb7ceee |
2142 | * 0b997eb7ceee |
2143 | | |
2143 | | |
2144 o | b18bc8331526 |
2144 * | b18bc8331526 |
2145 |/ |
2145 |/ |
2146 | x ba2ed02b0c9a |
2146 | x ba2ed02b0c9a |
2147 | | Obsfate: rewritten using rebase as 10:eceed8f98ffc |
2147 | | Obsfate: rewritten using rebase as 10:eceed8f98ffc |
2148 | x 4a004186e638 |
2148 | x 4a004186e638 |
2149 |/ Obsfate: rewritten using amend as 8:b18bc8331526 |
2149 |/ Obsfate: rewritten using amend as 8:b18bc8331526 |
2150 | Obsfate: rewritten using amend as 9:0b997eb7ceee |
2150 | Obsfate: rewritten using amend as 9:0b997eb7ceee |
2151 o dd800401bd8c |
2151 * dd800401bd8c |
2152 | |
2152 | |
2153 | @ 9bd10a0775e4 |
2153 | @ 9bd10a0775e4 |
2154 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a |
2154 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a |
2155 o f897c6137566 |
2155 o f897c6137566 |
2156 | |
2156 | |
2160 | x 471f378eab4c |
2160 | x 471f378eab4c |
2161 |/ Obsfate: rewritten as 2:0dec01379d3b |
2161 |/ Obsfate: rewritten as 2:0dec01379d3b |
2162 o ea207398892e |
2162 o ea207398892e |
2163 |
2163 |
2164 $ hg fatelogkw --hidden -v |
2164 $ hg fatelogkw --hidden -v |
2165 o eceed8f98ffc |
2165 * eceed8f98ffc |
2166 | |
2166 | |
2167 | o 0b997eb7ceee |
2167 | * 0b997eb7ceee |
2168 | | |
2168 | | |
2169 o | b18bc8331526 |
2169 * | b18bc8331526 |
2170 |/ |
2170 |/ |
2171 | x ba2ed02b0c9a |
2171 | x ba2ed02b0c9a |
2172 | | Obsfate: rewritten using rebase as 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000) |
2172 | | Obsfate: rewritten using rebase as 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000) |
2173 | x 4a004186e638 |
2173 | x 4a004186e638 |
2174 |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000) |
2174 |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000) |
2175 | Obsfate: rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000) |
2175 | Obsfate: rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000) |
2176 o dd800401bd8c |
2176 * dd800401bd8c |
2177 | |
2177 | |
2178 | @ 9bd10a0775e4 |
2178 | @ 9bd10a0775e4 |
2179 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000) |
2179 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000) |
2180 o f897c6137566 |
2180 o f897c6137566 |
2181 | |
2181 | |
2185 | x 471f378eab4c |
2185 | x 471f378eab4c |
2186 |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000) |
2186 |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000) |
2187 o ea207398892e |
2187 o ea207398892e |
2188 |
2188 |
2189 $ hg log -G -T "default" --hidden |
2189 $ hg log -G -T "default" --hidden |
2190 o changeset: 10:eceed8f98ffc |
2190 * changeset: 10:eceed8f98ffc |
2191 | tag: tip |
2191 | tag: tip |
2192 | parent: 8:b18bc8331526 |
2192 | parent: 8:b18bc8331526 |
2193 | user: test |
2193 | user: test |
2194 | date: Thu Jan 01 00:00:00 1970 +0000 |
2194 | date: Thu Jan 01 00:00:00 1970 +0000 |
2195 | instability: content-divergent |
2195 | instability: content-divergent |
2196 | summary: Add A,B,C |
2196 | summary: Add A,B,C |
2197 | |
2197 | |
2198 | o changeset: 9:0b997eb7ceee |
2198 | * changeset: 9:0b997eb7ceee |
2199 | | parent: 5:dd800401bd8c |
2199 | | parent: 5:dd800401bd8c |
2200 | | user: test |
2200 | | user: test |
2201 | | date: Thu Jan 01 00:00:00 1970 +0000 |
2201 | | date: Thu Jan 01 00:00:00 1970 +0000 |
2202 | | instability: content-divergent |
2202 | | instability: content-divergent |
2203 | | summary: Add B only |
2203 | | summary: Add B only |
2204 | | |
2204 | | |
2205 o | changeset: 8:b18bc8331526 |
2205 * | changeset: 8:b18bc8331526 |
2206 |/ parent: 5:dd800401bd8c |
2206 |/ parent: 5:dd800401bd8c |
2207 | user: test |
2207 | user: test |
2208 | date: Thu Jan 01 00:00:00 1970 +0000 |
2208 | date: Thu Jan 01 00:00:00 1970 +0000 |
2209 | instability: content-divergent |
2209 | instability: content-divergent |
2210 | summary: Add only B |
2210 | summary: Add only B |
2220 | date: Thu Jan 01 00:00:00 1970 +0000 |
2220 | date: Thu Jan 01 00:00:00 1970 +0000 |
2221 | obsolete: rewritten using amend as 8:b18bc8331526 |
2221 | obsolete: rewritten using amend as 8:b18bc8331526 |
2222 | obsolete: rewritten using amend as 9:0b997eb7ceee |
2222 | obsolete: rewritten using amend as 9:0b997eb7ceee |
2223 | summary: Add A,B,C |
2223 | summary: Add A,B,C |
2224 | |
2224 | |
2225 o changeset: 5:dd800401bd8c |
2225 * changeset: 5:dd800401bd8c |
2226 | parent: 3:f897c6137566 |
2226 | parent: 3:f897c6137566 |
2227 | user: test |
2227 | user: test |
2228 | date: Thu Jan 01 00:00:00 1970 +0000 |
2228 | date: Thu Jan 01 00:00:00 1970 +0000 |
2229 | instability: content-divergent |
2229 | instability: content-divergent |
2230 | summary: Add A,B,C |
2230 | summary: Add A,B,C |