##// END OF EJS Templates
reset mtime when two files are equal
Benoit Boissinot -
r1532:27077812 default
parent child Browse files
Show More
@@ -486,6 +486,10 b' class localrepository:'
486
486
487 # are we comparing the working directory?
487 # are we comparing the working directory?
488 if not node2:
488 if not node2:
489 try:
490 wlock = self.wlock(wait=0)
491 except lock.LockHeld:
492 wlock = None
489 l, c, a, d, u = self.dirstate.changes(files, match)
493 l, c, a, d, u = self.dirstate.changes(files, match)
490
494
491 # are we comparing working dir against its parent?
495 # are we comparing working dir against its parent?
@@ -497,6 +501,8 b' class localrepository:'
497 for f in l:
501 for f in l:
498 if fcmp(f, mf2):
502 if fcmp(f, mf2):
499 c.append(f)
503 c.append(f)
504 elif wlock is not None:
505 self.dirstate.update([f], "n")
500
506
501 for l in c, a, d, u:
507 for l in c, a, d, u:
502 l.sort()
508 l.sort()
General Comments 0
You need to be logged in to leave comments. Login now