##// END OF EJS Templates
tags: fix typo in fast path detection of fnode resolution (issue6673)...
Yuya Nishihara -
r49846:d4b66dc5 stable
parent child Browse files
Show More
@@ -808,7 +808,7 b' class hgtagsfnodescache(object):'
808 808 # There is some no-merge changeset where p1 is null and p2 is set
809 809 # Processing them as merge is just slower, but still gives a good
810 810 # result.
811 p2node = cl.node(p1rev)
811 p2node = cl.node(p2rev)
812 812 p2fnode = self.getfnode(p2node, computemissing=False)
813 813 if p1fnode != p2fnode:
814 814 # we cannot rely on readfast because we don't know against what
@@ -933,3 +933,58 b' Avoid writing logs on trying to delete a'
933 933 a8a82d372bb35b42ff736e74f07c23bcd99c371f a
934 934 a8a82d372bb35b42ff736e74f07c23bcd99c371f a
935 935 0000000000000000000000000000000000000000 a
936
937 $ cd ..
938
939 .hgtags fnode should be properly resolved at merge revision (issue6673)
940
941 $ hg init issue6673
942 $ cd issue6673
943
944 $ touch a
945 $ hg ci -qAm a
946 $ hg branch -q stable
947 $ hg ci -m branch
948
949 $ hg up -q default
950 $ hg merge -q stable
951 $ hg ci -m merge
952
953 add tag to stable branch:
954
955 $ hg up -q stable
956 $ echo a >> a
957 $ hg ci -m a
958 $ hg tag whatever
959 $ hg log -GT'{rev} {tags}\n'
960 @ 4 tip
961 |
962 o 3 whatever
963 |
964 | o 2
965 |/|
966 o | 1
967 |/
968 o 0
969
970
971 merge tagged stable into default:
972
973 $ hg up -q default
974 $ hg merge -q stable
975 $ hg ci -m merge
976 $ hg log -GT'{rev} {tags}\n'
977 @ 5 tip
978 |\
979 | o 4
980 | |
981 | o 3 whatever
982 | |
983 o | 2
984 |\|
985 | o 1
986 |/
987 o 0
988
989
990 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now