Show More
@@ -538,6 +538,8 b' def showgraphnode(repo, ctx, **args):' | |||||
538 | return '@' |
|
538 | return '@' | |
539 | elif ctx.obsolete(): |
|
539 | elif ctx.obsolete(): | |
540 | return 'x' |
|
540 | return 'x' | |
|
541 | elif ctx.isunstable(): | |||
|
542 | return '*' | |||
541 | elif ctx.closesbranch(): |
|
543 | elif ctx.closesbranch(): | |
542 | return '_' |
|
544 | return '_' | |
543 | else: |
|
545 | else: |
@@ -188,7 +188,7 b' With allowunstable, amend could work in ' | |||||
188 | $ hg log -T '{rev} {node|short} {desc}\n' -G |
|
188 | $ hg log -T '{rev} {node|short} {desc}\n' -G | |
189 | @ 3 be169c7e8dbe B |
|
189 | @ 3 be169c7e8dbe B | |
190 | | |
|
190 | | | |
191 |
| |
|
191 | | * 2 26805aba1e60 C | |
192 | | | |
|
192 | | | | |
193 | | x 1 112478962961 B |
|
193 | | x 1 112478962961 B | |
194 | |/ |
|
194 | |/ |
@@ -208,7 +208,7 b' Create obsmarkers via comments' | |||||
208 | > EOS |
|
208 | > EOS | |
209 |
|
209 | |||
210 | $ hg log -r 'sort(all(), topo)' -G --hidden -T '{desc} {node}' |
|
210 | $ hg log -r 'sort(all(), topo)' -G --hidden -T '{desc} {node}' | |
211 |
|
|
211 | * G 711f53bbef0bebd12eb6f0511d5e2e998b984846 | |
212 | | |
|
212 | | | |
213 | x F 64a8289d249234b9886244d379f15e6b650b28e3 |
|
213 | x F 64a8289d249234b9886244d379f15e6b650b28e3 | |
214 | | |
|
214 | | |
@@ -68,7 +68,7 b' initial' | |||||
68 | $ hg log -G --hidden |
|
68 | $ hg log -G --hidden | |
69 | @ e5ea8f9c7314 (draft): A1 |
|
69 | @ e5ea8f9c7314 (draft): A1 | |
70 | | |
|
70 | | | |
71 |
| |
|
71 | | * 06055a7959d4 (draft): B | |
72 | | | |
|
72 | | | | |
73 | | x 28b51eb45704 (draft): A0 |
|
73 | | x 28b51eb45704 (draft): A0 | |
74 | |/ |
|
74 | |/ |
@@ -80,7 +80,7 b' initial' | |||||
80 | | |
|
80 | | | |
81 | @ e5ea8f9c7314 (draft): A1 |
|
81 | @ e5ea8f9c7314 (draft): A1 | |
82 | | |
|
82 | | | |
83 |
| |
|
83 | | * 1d0f3cd25300 (draft): C | |
84 | | | |
|
84 | | | | |
85 | | x 6e72f0a95b5e (draft): B0 |
|
85 | | x 6e72f0a95b5e (draft): B0 | |
86 | | | |
|
86 | | | |
@@ -820,7 +820,7 b' Test setup' | |||||
820 | | instability: content-divergent |
|
820 | | instability: content-divergent | |
821 | | summary: A2 |
|
821 | | summary: A2 | |
822 | | |
|
822 | | | |
823 |
| |
|
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 | |
@@ -856,7 +856,7 b' Test setup' | |||||
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 |
| |
|
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 | |
@@ -884,12 +884,12 b' Check templates' | |||||
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 |
|
|
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 |
| |
|
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"] | |
@@ -902,9 +902,9 b' Predecessors template should show curren' | |||||
902 | o ea207398892e |
|
902 | o ea207398892e | |
903 |
|
903 | |||
904 | $ hg fatelog |
|
904 | $ hg fatelog | |
905 |
|
|
905 | * 019fadeab383 | |
906 | | |
|
906 | | | |
907 |
| |
|
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); | |
@@ -916,7 +916,7 b' Predecessors template should show curren' | |||||
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 |
|
|
919 | * 019fadeab383 | |
920 | | |
|
920 | | | |
921 | | @ fdf9bde5129a |
|
921 | | @ fdf9bde5129a | |
922 | |/ |
|
922 | |/ | |
@@ -924,7 +924,7 b' the log' | |||||
924 |
|
924 | |||
925 |
|
925 | |||
926 | $ hg fatelog |
|
926 | $ hg fatelog | |
927 |
|
|
927 | * 019fadeab383 | |
928 | | |
|
928 | | | |
929 | | @ fdf9bde5129a |
|
929 | | @ fdf9bde5129a | |
930 | |/ |
|
930 | |/ | |
@@ -933,7 +933,7 b' the log' | |||||
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 |
|
|
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"] | |
@@ -960,7 +960,7 b' Predecessors template should the predece' | |||||
960 |
|
960 | |||
961 |
|
961 | |||
962 | $ hg fatelog --hidden |
|
962 | $ hg fatelog --hidden | |
963 |
|
|
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); | |
@@ -972,7 +972,7 b' Predecessors template should the predece' | |||||
972 |
|
972 | |||
973 |
|
973 | |||
974 | $ hg fatelogjson --hidden |
|
974 | $ hg fatelogjson --hidden | |
975 |
|
|
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"]}] | |
@@ -987,7 +987,7 b' Check other fatelog implementations' | |||||
987 | ----------------------------------- |
|
987 | ----------------------------------- | |
988 |
|
988 | |||
989 | $ hg fatelogkw --hidden -q |
|
989 | $ hg fatelogkw --hidden -q | |
990 |
|
|
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 | |
@@ -999,7 +999,7 b' Check other fatelog implementations' | |||||
999 | o ea207398892e |
|
999 | o ea207398892e | |
1000 |
|
1000 | |||
1001 | $ hg fatelogkw --hidden |
|
1001 | $ hg fatelogkw --hidden | |
1002 |
|
|
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 | |
@@ -1011,7 +1011,7 b' Check other fatelog implementations' | |||||
1011 | o ea207398892e |
|
1011 | o ea207398892e | |
1012 |
|
1012 | |||
1013 | $ hg fatelogkw --hidden -v |
|
1013 | $ hg fatelogkw --hidden -v | |
1014 |
|
|
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) | |
@@ -1023,7 +1023,7 b' Check other fatelog implementations' | |||||
1023 | o ea207398892e |
|
1023 | o ea207398892e | |
1024 |
|
1024 | |||
1025 | $ hg log -G -T "default" --hidden |
|
1025 | $ hg log -G -T "default" --hidden | |
1026 |
|
|
1026 | * changeset: 4:019fadeab383 | |
1027 | | tag: tip |
|
1027 | | tag: tip | |
1028 | | parent: 0:ea207398892e |
|
1028 | | parent: 0:ea207398892e | |
1029 | | user: test |
|
1029 | | user: test | |
@@ -1877,14 +1877,14 b' Diverge one of the splitted commit' | |||||
1877 | | instability: content-divergent |
|
1877 | | instability: content-divergent | |
1878 | | summary: Add B only |
|
1878 | | summary: Add B only | |
1879 | | |
|
1879 | | | |
1880 |
| |
|
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 |
| |
|
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 | |
@@ -1897,7 +1897,7 b' Diverge one of the splitted commit' | |||||
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 |
|
|
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 | |
@@ -1925,19 +1925,19 b' Check templates' | |||||
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 |
| |
|
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 |
| |
|
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 |
|
|
1940 | * dd800401bd8c | |
1941 | | |
|
1941 | | | |
1942 | o f897c6137566 |
|
1942 | o f897c6137566 | |
1943 | | |
|
1943 | | | |
@@ -1946,13 +1946,13 b' Check templates' | |||||
1946 | $ hg fatelog |
|
1946 | $ hg fatelog | |
1947 | @ 0b997eb7ceee |
|
1947 | @ 0b997eb7ceee | |
1948 | | |
|
1948 | | | |
1949 |
| |
|
1949 | | * b18bc8331526 | |
1950 | |/ |
|
1950 | |/ | |
1951 |
| |
|
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 |
|
|
1955 | * dd800401bd8c | |
1956 | | |
|
1956 | | | |
1957 | o f897c6137566 |
|
1957 | o f897c6137566 | |
1958 | | |
|
1958 | | | |
@@ -1964,12 +1964,12 b' Check templates' | |||||
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 |
| |
|
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 |
| |
|
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"] | |
@@ -1983,7 +1983,7 b' Check templates' | |||||
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 |
|
|
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"] | |
@@ -2019,13 +2019,13 b' Check templates' | |||||
2019 | $ hg fatelog --hidden |
|
2019 | $ hg fatelog --hidden | |
2020 | @ 0b997eb7ceee |
|
2020 | @ 0b997eb7ceee | |
2021 | | |
|
2021 | | | |
2022 |
| |
|
2022 | | * b18bc8331526 | |
2023 | |/ |
|
2023 | |/ | |
2024 |
| |
|
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 |
|
|
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); | |
@@ -2040,13 +2040,13 b' Check templates' | |||||
2040 | $ hg fatelogjson --hidden |
|
2040 | $ hg fatelogjson --hidden | |
2041 | @ 0b997eb7ceee |
|
2041 | @ 0b997eb7ceee | |
2042 | | |
|
2042 | | | |
2043 |
| |
|
2043 | | * b18bc8331526 | |
2044 | |/ |
|
2044 | |/ | |
2045 |
| |
|
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 |
|
|
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"]}] | |
@@ -2063,22 +2063,22 b' Check templates' | |||||
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 |
|
|
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 |
| |
|
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 |
|
|
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 |
|
|
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"] | |
@@ -2094,13 +2094,13 b' Check templates' | |||||
2094 |
|
2094 | |||
2095 |
|
2095 | |||
2096 | $ hg fatelog |
|
2096 | $ hg fatelog | |
2097 |
|
|
2097 | * eceed8f98ffc | |
2098 | | |
|
2098 | | | |
2099 |
| |
|
2099 | | * 0b997eb7ceee | |
2100 | | | |
|
2100 | | | | |
2101 |
|
|
2101 | * | b18bc8331526 | |
2102 | |/ |
|
2102 | |/ | |
2103 |
|
|
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); | |
@@ -2112,18 +2112,18 b' Check other fatelog implementations' | |||||
2112 | ----------------------------------- |
|
2112 | ----------------------------------- | |
2113 |
|
2113 | |||
2114 | $ hg fatelogkw --hidden -q |
|
2114 | $ hg fatelogkw --hidden -q | |
2115 |
|
|
2115 | * eceed8f98ffc | |
2116 | | |
|
2116 | | | |
2117 |
| |
|
2117 | | * 0b997eb7ceee | |
2118 | | | |
|
2118 | | | | |
2119 |
|
|
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 |
|
|
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 | |
@@ -2137,18 +2137,18 b' Check other fatelog implementations' | |||||
2137 | o ea207398892e |
|
2137 | o ea207398892e | |
2138 |
|
2138 | |||
2139 | $ hg fatelogkw --hidden |
|
2139 | $ hg fatelogkw --hidden | |
2140 |
|
|
2140 | * eceed8f98ffc | |
2141 | | |
|
2141 | | | |
2142 |
| |
|
2142 | | * 0b997eb7ceee | |
2143 | | | |
|
2143 | | | | |
2144 |
|
|
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 |
|
|
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 | |
@@ -2162,18 +2162,18 b' Check other fatelog implementations' | |||||
2162 | o ea207398892e |
|
2162 | o ea207398892e | |
2163 |
|
2163 | |||
2164 | $ hg fatelogkw --hidden -v |
|
2164 | $ hg fatelogkw --hidden -v | |
2165 |
|
|
2165 | * eceed8f98ffc | |
2166 | | |
|
2166 | | | |
2167 |
| |
|
2167 | | * 0b997eb7ceee | |
2168 | | | |
|
2168 | | | | |
2169 |
|
|
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 |
|
|
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) | |
@@ -2187,7 +2187,7 b' Check other fatelog implementations' | |||||
2187 | o ea207398892e |
|
2187 | o ea207398892e | |
2188 |
|
2188 | |||
2189 | $ hg log -G -T "default" --hidden |
|
2189 | $ hg log -G -T "default" --hidden | |
2190 |
|
|
2190 | * changeset: 10:eceed8f98ffc | |
2191 | | tag: tip |
|
2191 | | tag: tip | |
2192 | | parent: 8:b18bc8331526 |
|
2192 | | parent: 8:b18bc8331526 | |
2193 | | user: test |
|
2193 | | user: test | |
@@ -2195,14 +2195,14 b' Check other fatelog implementations' | |||||
2195 | | instability: content-divergent |
|
2195 | | instability: content-divergent | |
2196 | | summary: Add A,B,C |
|
2196 | | summary: Add A,B,C | |
2197 | | |
|
2197 | | | |
2198 |
| |
|
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 |
|
|
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 | |
@@ -2222,7 +2222,7 b' Check other fatelog implementations' | |||||
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 |
|
|
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 |
@@ -62,9 +62,9 b' A_1 have two direct and divergent succes' | |||||
62 | obsoleted 1 changesets |
|
62 | obsoleted 1 changesets | |
63 | $ hg debugobsolete `getid A_0` `getid A_2` |
|
63 | $ hg debugobsolete `getid A_0` `getid A_2` | |
64 | $ hg log -G --hidden |
|
64 | $ hg log -G --hidden | |
65 |
|
|
65 | * 3:392fd25390da A_2 | |
66 | | |
|
66 | | | |
67 |
| |
|
67 | | * 2:82623d38b9ba A_1 | |
68 | |/ |
|
68 | |/ | |
69 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] |
|
69 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] | |
70 | |/ |
|
70 | |/ | |
@@ -129,7 +129,7 b' indirect divergence with known changeset' | |||||
129 | | |
|
129 | | | |
130 | | x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda] |
|
130 | | x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda] | |
131 | |/ |
|
131 | |/ | |
132 |
| |
|
132 | | * 2:82623d38b9ba A_1 | |
133 | |/ |
|
133 | |/ | |
134 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] |
|
134 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] | |
135 | |/ |
|
135 | |/ | |
@@ -181,9 +181,9 b' indirect divergence with known changeset' | |||||
181 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1` |
|
181 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1` | |
182 | $ hg debugobsolete `getid A_0` `getid A_2` |
|
182 | $ hg debugobsolete `getid A_0` `getid A_2` | |
183 | $ hg log -G --hidden |
|
183 | $ hg log -G --hidden | |
184 |
|
|
184 | * 3:392fd25390da A_2 | |
185 | | |
|
185 | | | |
186 |
| |
|
186 | | * 2:82623d38b9ba A_1 | |
187 | |/ |
|
187 | |/ | |
188 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] |
|
188 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] | |
189 | |/ |
|
189 | |/ | |
@@ -431,11 +431,11 b' Check more complex obsolescence graft (w' | |||||
431 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
431 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
432 | $ hg debugobsolete `getid A_5` `getid A_9` |
|
432 | $ hg debugobsolete `getid A_5` `getid A_9` | |
433 | $ hg log -G --hidden |
|
433 | $ hg log -G --hidden | |
434 |
|
|
434 | * 10:bed64f5d2f5a A_9 | |
435 | | |
|
435 | | | |
436 |
| |
|
436 | | * 9:14608b260df8 A_8 | |
437 | |/ |
|
437 | |/ | |
438 |
| |
|
438 | | * 8:7ae126973a96 A_7 | |
439 | |/ |
|
439 | |/ | |
440 | | x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da] |
|
440 | | x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da] | |
441 | | | |
|
441 | | | | |
@@ -443,7 +443,7 b' Check more complex obsolescence graft (w' | |||||
443 | |/ |
|
443 | |/ | |
444 | | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690] |
|
444 | | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690] | |
445 | |/ |
|
445 | |/ | |
446 |
| |
|
446 | | * 4:01f36c5a8fda A_3 | |
447 | |/ |
|
447 | |/ | |
448 | | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a] |
|
448 | | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a] | |
449 | |/ |
|
449 | |/ | |
@@ -673,7 +673,7 b' Use scmutil.cleanupnodes API to create d' | |||||
673 | $ hg log -G -T '{rev}:{node|short} {desc} {instabilities}' -r 'sort(all(), topo)' |
|
673 | $ hg log -G -T '{rev}:{node|short} {desc} {instabilities}' -r 'sort(all(), topo)' | |
674 | @ 5:1a2a9b5b0030 B2 content-divergent |
|
674 | @ 5:1a2a9b5b0030 B2 content-divergent | |
675 | | |
|
675 | | | |
676 |
| |
|
676 | | * 4:70d5a63ca112 B4 content-divergent | |
677 | | | |
|
677 | | | | |
678 | | o 1:48b9aae0607f Z |
|
678 | | o 1:48b9aae0607f Z | |
679 | | |
|
679 | | |
@@ -64,7 +64,7 b' Test setup' | |||||
64 | $ hg log -G --hidden |
|
64 | $ hg log -G --hidden | |
65 | @ f6082bc4ffef (draft): A1 |
|
65 | @ f6082bc4ffef (draft): A1 | |
66 | | |
|
66 | | | |
67 |
| |
|
67 | | * d73caddc5533 (draft): B0 | |
68 | | | |
|
68 | | | | |
69 | | x 8aaa48160adc (draft): A0 |
|
69 | | x 8aaa48160adc (draft): A0 | |
70 | |/ |
|
70 | |/ |
@@ -64,7 +64,7 b' Test setup' | |||||
64 | $ hg log -G --hidden |
|
64 | $ hg log -G --hidden | |
65 | @ 0f88766e02d6 (draft): C0 |
|
65 | @ 0f88766e02d6 (draft): C0 | |
66 | | |
|
66 | | | |
67 |
| |
|
67 | | * d73caddc5533 (draft): B0 | |
68 | | | |
|
68 | | | | |
69 | | x 8aaa48160adc (draft): A0 |
|
69 | | x 8aaa48160adc (draft): A0 | |
70 | |/ |
|
70 | |/ |
@@ -1735,7 +1735,7 b' racing commit push a new head obsoleting' | |||||
1735 | $ hg -R server graph |
|
1735 | $ hg -R server graph | |
1736 | o 720c5163ecf6 C-V (default) |
|
1736 | o 720c5163ecf6 C-V (default) | |
1737 | | |
|
1737 | | | |
1738 |
| |
|
1738 | | * a98a47d8b85b C-U (default) | |
1739 | | | |
|
1739 | | | | |
1740 | | x b0ee3d6f51bc C-Q (default) |
|
1740 | | x b0ee3d6f51bc C-Q (default) | |
1741 | |/ |
|
1741 | |/ | |
@@ -1835,9 +1835,9 b' Check the result of the push' | |||||
1835 | b0ee3d6f51bc4c0ca6d4f2907708027a6c376233 720c5163ecf64dcc6216bee2d62bf3edb1882499 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1835 | b0ee3d6f51bc4c0ca6d4f2907708027a6c376233 720c5163ecf64dcc6216bee2d62bf3edb1882499 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1836 | 720c5163ecf64dcc6216bee2d62bf3edb1882499 39bc0598afe90ab18da460bafecc0fa953b77596 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1836 | 720c5163ecf64dcc6216bee2d62bf3edb1882499 39bc0598afe90ab18da460bafecc0fa953b77596 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1837 | $ hg -R server graph --hidden |
|
1837 | $ hg -R server graph --hidden | |
1838 |
|
|
1838 | * 39bc0598afe9 C-W (default) | |
1839 | | |
|
1839 | | | |
1840 |
| |
|
1840 | | * a98a47d8b85b C-U (default) | |
1841 | |/ |
|
1841 | |/ | |
1842 | x b0ee3d6f51bc C-Q (default) |
|
1842 | x b0ee3d6f51bc C-Q (default) | |
1843 | | |
|
1843 | | |
@@ -190,7 +190,7 b' More complex case where part of the reba' | |||||
190 | $ hg log -G |
|
190 | $ hg log -G | |
191 | @ 11:4596109a6a43 D |
|
191 | @ 11:4596109a6a43 D | |
192 | | |
|
192 | | | |
193 |
| |
|
193 | | * 10:5ae4c968c6ac C | |
194 | | | |
|
194 | | | | |
195 | | x 9:08483444fef9 D (rewritten using rebase as 11:4596109a6a43) |
|
195 | | x 9:08483444fef9 D (rewritten using rebase as 11:4596109a6a43) | |
196 | | | |
|
196 | | | | |
@@ -464,7 +464,7 b' Test that rewriting leaving instability ' | |||||
464 | | |
|
464 | | | |
465 | o 10:7c6027df6a99 B |
|
465 | o 10:7c6027df6a99 B | |
466 | | |
|
466 | | | |
467 |
| |
|
467 | | * 9:cf44d2f5a9f4 D | |
468 | | | |
|
468 | | | | |
469 | | x 8:e273c5e7d2d2 C (rewritten using rebase as 11:0d8f238b634c) |
|
469 | | x 8:e273c5e7d2d2 C (rewritten using rebase as 11:0d8f238b634c) | |
470 | | | |
|
470 | | | | |
@@ -494,7 +494,7 b' Test multiple root handling' | |||||
494 | | |
|
494 | | | |
495 | | o 12:102b4c1d889b D |
|
495 | | o 12:102b4c1d889b D | |
496 | |/ |
|
496 | |/ | |
497 |
| |
|
497 | | * 10:7c6027df6a99 B | |
498 | | | |
|
498 | | | | |
499 | | x 7:02de42196ebe H (rewritten using rebase as 13:bfe264faf697) |
|
499 | | x 7:02de42196ebe H (rewritten using rebase as 13:bfe264faf697) | |
500 | | | |
|
500 | | | | |
@@ -588,7 +588,7 b' test on rebase dropping a merge' | |||||
588 | | |
|
588 | | | |
589 | | o 10:b5313c85b22e D |
|
589 | | o 10:b5313c85b22e D | |
590 | |/ |
|
590 | |/ | |
591 |
| |
|
591 | | * 8:53a6a128b2b7 M | |
592 | | |\ |
|
592 | | |\ | |
593 | | | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97) |
|
593 | | | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97) | |
594 | | | | |
|
594 | | | | | |
@@ -623,15 +623,15 b' Test hidden changesets in the rebase set' | |||||
623 | $ hg log -G |
|
623 | $ hg log -G | |
624 | @ 15:5ae8a643467b J |
|
624 | @ 15:5ae8a643467b J | |
625 | | |
|
625 | | | |
626 |
|
|
626 | * 14:9ad579b4a5de I | |
627 | | |
|
627 | | | |
628 |
| |
|
628 | | * 12:acd174b7ab39 I | |
629 | | | |
|
629 | | | | |
630 | | o 11:6c11a6218c97 H |
|
630 | | o 11:6c11a6218c97 H | |
631 | | | |
|
631 | | | | |
632 | o | 10:b5313c85b22e D |
|
632 | o | 10:b5313c85b22e D | |
633 | |/ |
|
633 | |/ | |
634 |
| |
|
634 | | * 8:53a6a128b2b7 M | |
635 | | |\ |
|
635 | | |\ | |
636 | | | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97) |
|
636 | | | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97) | |
637 | | | | |
|
637 | | | | | |
@@ -665,21 +665,21 b' Test hidden changesets in the rebase set' | |||||
665 | $ hg log -G |
|
665 | $ hg log -G | |
666 | @ 18:bfaedf8eb73b M |
|
666 | @ 18:bfaedf8eb73b M | |
667 | | |
|
667 | | | |
668 |
| |
|
668 | | * 17:97219452e4bd L | |
669 | | | |
|
669 | | | | |
670 | | x 16:fc37a630c901 K (rewritten using amend as 18:bfaedf8eb73b) |
|
670 | | x 16:fc37a630c901 K (rewritten using amend as 18:bfaedf8eb73b) | |
671 | |/ |
|
671 | |/ | |
672 |
| |
|
672 | | * 15:5ae8a643467b J | |
673 | | | |
|
673 | | | | |
674 | | x 14:9ad579b4a5de I (rewritten using amend as 16:fc37a630c901) |
|
674 | | x 14:9ad579b4a5de I (rewritten using amend as 16:fc37a630c901) | |
675 | |/ |
|
675 | |/ | |
676 |
| |
|
676 | | * 12:acd174b7ab39 I | |
677 | | | |
|
677 | | | | |
678 | | o 11:6c11a6218c97 H |
|
678 | | o 11:6c11a6218c97 H | |
679 | | | |
|
679 | | | | |
680 | o | 10:b5313c85b22e D |
|
680 | o | 10:b5313c85b22e D | |
681 | |/ |
|
681 | |/ | |
682 |
| |
|
682 | | * 8:53a6a128b2b7 M | |
683 | | |\ |
|
683 | | |\ | |
684 | | | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97) |
|
684 | | | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97) | |
685 | | | | |
|
685 | | | | | |
@@ -1016,7 +1016,7 b' obsolete changeset which successor is in' | |||||
1016 | > a |
|
1016 | > a | |
1017 | > EOF |
|
1017 | > EOF | |
1018 | $ hg log -G -r 'a':: |
|
1018 | $ hg log -G -r 'a':: | |
1019 |
|
|
1019 | * 7:1143e9adc121 f | |
1020 | | |
|
1020 | | | |
1021 | | o 6:d60ebfa0f1cb e |
|
1021 | | o 6:d60ebfa0f1cb e | |
1022 | | | |
|
1022 | | | | |
@@ -1052,7 +1052,7 b' consequence f (descendant of d) is left ' | |||||
1052 | | |
|
1052 | | | |
1053 | o 8:67e8f4a16c49 b |
|
1053 | o 8:67e8f4a16c49 b | |
1054 | | |
|
1054 | | | |
1055 |
| |
|
1055 | | * 7:1143e9adc121 f | |
1056 | | | |
|
1056 | | | | |
1057 | | | x 6:d60ebfa0f1cb e (rewritten using rebase as 11:eb6d63fc4ed5) |
|
1057 | | | x 6:d60ebfa0f1cb e (rewritten using rebase as 11:eb6d63fc4ed5) | |
1058 | | | | |
|
1058 | | | | | |
@@ -1085,15 +1085,15 b' By allowing divergence, we can perform t' | |||||
1085 | $ hg log -G -r 'a':: -T instabilities |
|
1085 | $ hg log -G -r 'a':: -T instabilities | |
1086 | o 10:e1744ea07510 f |
|
1086 | o 10:e1744ea07510 f | |
1087 | | |
|
1087 | | | |
1088 |
|
|
1088 | * 9:e2b36ea9a0a0 d (content-divergent) | |
1089 | | |
|
1089 | | | |
1090 | o 8:6a0376de376e c |
|
1090 | o 8:6a0376de376e c | |
1091 | | |
|
1091 | | | |
1092 | | x 7:1143e9adc121 f |
|
1092 | | x 7:1143e9adc121 f | |
1093 | | | |
|
1093 | | | | |
1094 |
| | |
|
1094 | | | * 6:d60ebfa0f1cb e (orphan) | |
1095 | | | | |
|
1095 | | | | | |
1096 |
| | |
|
1096 | | | * 5:027ad6c5830d d' (orphan content-divergent) | |
1097 | | | | |
|
1097 | | | | | |
1098 | | x | 4:76be324c128b d |
|
1098 | | x | 4:76be324c128b d | |
1099 | | |/ |
|
1099 | | |/ | |
@@ -1132,7 +1132,7 b' Similar test on a more complex graph' | |||||
1132 | > a |
|
1132 | > a | |
1133 | > EOF |
|
1133 | > EOF | |
1134 | $ hg log -G -r 'a': |
|
1134 | $ hg log -G -r 'a': | |
1135 |
|
|
1135 | * 8:2876ce66c6eb g | |
1136 | | |
|
1136 | | | |
1137 | | o 7:3ffec603ab53 f |
|
1137 | | o 7:3ffec603ab53 f | |
1138 | | | |
|
1138 | | | | |
@@ -1168,7 +1168,7 b' Similar test on a more complex graph' | |||||
1168 | | |
|
1168 | | | |
1169 | o 9:67e8f4a16c49 b |
|
1169 | o 9:67e8f4a16c49 b | |
1170 | | |
|
1170 | | | |
1171 |
| |
|
1171 | | * 8:2876ce66c6eb g | |
1172 | | | |
|
1172 | | | | |
1173 | | | x 7:3ffec603ab53 f (rewritten using rebase as 12:ef6251596616) |
|
1173 | | | x 7:3ffec603ab53 f (rewritten using rebase as 12:ef6251596616) | |
1174 | | | | |
|
1174 | | | | | |
@@ -1531,7 +1531,7 b' parent gets moved:' | |||||
1531 | | | |
|
1531 | | | | |
1532 | o | E |
|
1532 | o | E | |
1533 | | | |
|
1533 | | | | |
1534 |
| |
|
1534 | | * C | |
1535 | | | |
|
1535 | | | | |
1536 | o | D2 |
|
1536 | o | D2 | |
1537 | | | |
|
1537 | | | |
@@ -431,11 +431,11 b' Split a non-head without rebase' | |||||
431 | | |
|
431 | | | |
432 | o 5:e704349bd21b split 1 |
|
432 | o 5:e704349bd21b split 1 | |
433 | | |
|
433 | | | |
434 |
| |
|
434 | | * 4:777940761eba d3 d3 | |
435 | | | |
|
435 | | | | |
436 | | @ 3:f4a0a8d004cc d2 d2 |
|
436 | | @ 3:f4a0a8d004cc d2 d2 | |
437 | | | |
|
437 | | | | |
438 |
| |
|
438 | | * 2:b5c5ea414030 d1 d1 | |
439 | | | |
|
439 | | | | |
440 | | x 1:1df0d5c5a3ab a2 |
|
440 | | x 1:1df0d5c5a3ab a2 | |
441 | |/ |
|
441 | |/ | |
@@ -509,13 +509,13 b' Split a non-head with obsoleted descenda' | |||||
509 | |/ |
|
509 | |/ | |
510 | o 11:0947baa74d47 Split B |
|
510 | o 11:0947baa74d47 Split B | |
511 | | |
|
511 | | | |
512 |
| |
|
512 | | * 9:88ede1d5ee13 I | |
513 | | | |
|
513 | | | | |
514 | | x 6:af8cbf225b7b G1 |
|
514 | | x 6:af8cbf225b7b G1 | |
515 | | | |
|
515 | | | | |
516 | | x 3:be0ef73c17ad D |
|
516 | | x 3:be0ef73c17ad D | |
517 | | | |
|
517 | | | | |
518 |
| | |
|
518 | | | * 8:74863e5b5074 H | |
519 | | | | |
|
519 | | | | | |
520 | | | x 5:ee481a2a1e69 F |
|
520 | | | x 5:ee481a2a1e69 F | |
521 | | | | |
|
521 | | | | |
@@ -1288,15 +1288,15 b' we have reusable code here' | |||||
1288 |
|
1288 | |||
1289 | $ rm .hg/localtags |
|
1289 | $ rm .hg/localtags | |
1290 | $ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)' |
|
1290 | $ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)' | |
1291 |
|
|
1291 | * 12:1473d4b996d1 G2 b-F@divergent3 b-G | |
1292 | | |
|
1292 | | | |
1293 |
| |
|
1293 | | * 11:d11b3456a873 F2 b-F | |
1294 | | | |
|
1294 | | | | |
1295 |
| |
|
1295 | | * 8:5cb05ba470a7 H | |
1296 | |/| |
|
1296 | |/| | |
1297 | | o 4:7fb047a69f22 E b-F@divergent1 |
|
1297 | | o 4:7fb047a69f22 E b-F@divergent1 | |
1298 | | | |
|
1298 | | | | |
1299 |
| | |
|
1299 | | | * 10:7c78f703e465 D2 b-D | |
1300 | | | | |
|
1300 | | | | | |
1301 | | | x 6:26805aba1e60 C |
|
1301 | | | x 6:26805aba1e60 C | |
1302 | | | | |
|
1302 | | | | |
@@ -242,21 +242,21 b' Partial uncommit in the middle, does not' | |||||
242 | | |
|
242 | | | |
243 | o 11:8eb87968f2edb7f27f27fe676316e179de65fff6 added file-ab |
|
243 | o 11:8eb87968f2edb7f27f27fe676316e179de65fff6 added file-ab | |
244 | | |
|
244 | | | |
245 |
| |
|
245 | | * 10:5dc89ca4486f8a88716c5797fa9f498d13d7c2e1 new abc | |
246 | | | |
|
246 | | | | |
247 |
| | |
|
247 | | | * 9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo | |
248 | | | | |
|
248 | | | | | |
249 | | | | x 8:83815831694b1271e9f207cb1b79b2b19275edcb files abcde + foo |
|
249 | | | | x 8:83815831694b1271e9f207cb1b79b2b19275edcb files abcde + foo | |
250 | | | |/ |
|
250 | | | |/ | |
251 | | | | x 7:0977fa602c2fd7d8427ed4e7ee15ea13b84c9173 update files for abcde |
|
251 | | | | x 7:0977fa602c2fd7d8427ed4e7ee15ea13b84c9173 update files for abcde | |
252 | | | |/ |
|
252 | | | |/ | |
253 |
| | |
|
253 | | | * 6:3727deee06f72f5ffa8db792ee299cf39e3e190b new change abcde | |
254 | | | | |
|
254 | | | | | |
255 | | | | x 5:0c07a3ccda771b25f1cb1edbd02e683723344ef1 new change abcde |
|
255 | | | | x 5:0c07a3ccda771b25f1cb1edbd02e683723344ef1 new change abcde | |
256 | | | |/ |
|
256 | | | |/ | |
257 | | | | x 4:6c4fd43ed714e7fcd8adbaa7b16c953c2e985b60 added file-abcde |
|
257 | | | | x 4:6c4fd43ed714e7fcd8adbaa7b16c953c2e985b60 added file-abcde | |
258 | | | |/ |
|
258 | | | |/ | |
259 |
| | |
|
259 | | | * 3:6db330d65db434145c0b59d291853e9a84719b24 added file-abcd | |
260 | | | | |
|
260 | | | | | |
261 | | | x 2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc |
|
261 | | | x 2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc | |
262 | | |/ |
|
262 | | |/ |
General Comments 0
You need to be logged in to leave comments.
Login now