##// END OF EJS Templates
Handle undeletion of files when checking out old revisions...
Matt Mackall -
r680:4b7b79d2 default
parent child Browse files
Show More
@@ -1394,9 +1394,11 b' class localrepository:'
1394 self.ui.debug("remote created %s\n" % f)
1394 self.ui.debug("remote created %s\n" % f)
1395 get[f] = n
1395 get[f] = n
1396 else:
1396 else:
1397 self.ui.debug("local deleted %s\n" % f)
1397 if force or p2 == pa: # going backwards?
1398 if force:
1398 self.ui.debug("local deleted %s, recreating\n" % f)
1399 get[f] = n
1399 get[f] = n
1400 else:
1401 self.ui.debug("local deleted %s\n" % f)
1400
1402
1401 del mw, m1, m2, ma
1403 del mw, m1, m2, ma
1402
1404
General Comments 0
You need to be logged in to leave comments. Login now