##// END OF EJS Templates
tests: better document the graft copy case...
Martin von Zweigbergk -
r42222:b9e5f385 default
parent child Browse files
Show More
@@ -927,7 +927,20 Graft from behind a move or rename
927
927
928 NOTE: This is affected by issue5343, and will need updating when it's fixed
928 NOTE: This is affected by issue5343, and will need updating when it's fixed
929
929
930 Possible cases during a regular graft (when ca is between cta and c2):
930 Consider this topology for a regular graft:
931
932 o c1
933 |
934 | o c2
935 | |
936 | o ca # stands for "common ancestor"
937 |/
938 o cta # stands for "common topological ancestor"
939
940 Note that in issue5343, ca==cta.
941
942 The following table shows the possible cases. Here, "x->y" and, equivalently,
943 "y<-x", where x is an ancestor of y, means that some copy happened from x to y.
931
944
932 name | c1<-cta | cta<->ca | ca->c2
945 name | c1<-cta | cta<->ca | ca->c2
933 A.0 | | |
946 A.0 | | |
@@ -955,6 +968,8 Finally, A.6 records a divergence entire
955
968
956 A.4 has a degenerate case a<-b<-a->a, where checkcopies isn't needed at all.
969 A.4 has a degenerate case a<-b<-a->a, where checkcopies isn't needed at all.
957 A.5 has a special case a<-b<-b->a, which is treated like a<-b->a in a merge.
970 A.5 has a special case a<-b<-b->a, which is treated like a<-b->a in a merge.
971 A.5 has issue5343 as a special case.
972 TODO: add test coverage for A.5
958 A.6 has a special case a<-a<-b->a. Here, checkcopies will find a spurious
973 A.6 has a special case a<-a<-b->a. Here, checkcopies will find a spurious
959 incomplete divergence, which is in fact complete. This is handled later in
974 incomplete divergence, which is in fact complete. This is handled later in
960 mergecopies.
975 mergecopies.
General Comments 0
You need to be logged in to leave comments. Login now