##// END OF EJS Templates
Fix yet another resolve corner case...
mpm@selenic.com -
r344:db419f14 default
parent child Browse files
Show More
@@ -1024,8 +1024,7 b' class localrepository:'
1024 1024 remove.append(f) # other deleted it
1025 1025 else:
1026 1026 if n == m1.get(f, nullid): # same as parent
1027 self.ui.debug("remote deleted %s\n" % f)
1028 remove.append(f)
1027 self.ui.debug("local created %s, keeping\n" % f)
1029 1028 else:
1030 1029 self.ui.debug("working dir created %s, keeping\n" % f)
1031 1030
General Comments 0
You need to be logged in to leave comments. Login now