equal
deleted
inserted
replaced
970 clean += fixup |
970 clean += fixup |
971 |
971 |
972 # update dirstate for files that are actually clean |
972 # update dirstate for files that are actually clean |
973 if fixup: |
973 if fixup: |
974 try: |
974 try: |
|
975 # updating the dirstate is optional |
|
976 # so we don't wait on the lock |
975 wlock = self.wlock(False) |
977 wlock = self.wlock(False) |
976 try: |
978 try: |
977 # updating the dirstate is optional |
|
978 # so we don't wait on the lock |
|
979 for f in fixup: |
979 for f in fixup: |
980 self.dirstate.normal(f) |
980 self.dirstate.normal(f) |
981 finally: |
981 finally: |
982 wlock.release() |
982 wlock.release() |
983 except error.LockError: |
983 except error.LockError: |