##// END OF EJS Templates
rust-dirstatemap: temporarily use `from_v1_data` in `addfile`...
marmoute -
r48705:226c7dbe default
parent child Browse files
Show More
@@ -615,7 +615,7 b' if rustmod is not None:'
615 )
615 )
616 elif (p1_tracked or p2_tracked) and not wc_tracked:
616 elif (p1_tracked or p2_tracked) and not wc_tracked:
617 # XXX might be merged and removed ?
617 # XXX might be merged and removed ?
618 self[filename] = DirstateItem(b'r', 0, 0, 0)
618 self[filename] = DirstateItem.from_v1_data(b'r', 0, 0, 0)
619 self.nonnormalset.add(filename)
619 self.nonnormalset.add(filename)
620 elif clean_p2 and wc_tracked:
620 elif clean_p2 and wc_tracked:
621 if p1_tracked or self.get(filename) is not None:
621 if p1_tracked or self.get(filename) is not None:
General Comments 0
You need to be logged in to leave comments. Login now