equal
deleted
inserted
replaced
464 # Remove lfiles for which the standin is deleted, unless the |
464 # Remove lfiles for which the standin is deleted, unless the |
465 # lfile is added to the repository again. This happens when a |
465 # lfile is added to the repository again. This happens when a |
466 # largefile is converted back to a normal file: the standin |
466 # largefile is converted back to a normal file: the standin |
467 # disappears, but a new (normal) file appears as the lfile. |
467 # disappears, but a new (normal) file appears as the lfile. |
468 if os.path.exists(abslfile) and lfile not in repo[None]: |
468 if os.path.exists(abslfile) and lfile not in repo[None]: |
469 os.unlink(abslfile) |
469 util.unlinkpath(abslfile) |
470 ret = -1 |
470 ret = -1 |
471 state = repo.dirstate[lfutil.standin(lfile)] |
471 state = repo.dirstate[lfutil.standin(lfile)] |
472 if state == 'n': |
472 if state == 'n': |
473 # When rebasing, we need to synchronize the standin and the largefile, |
473 # When rebasing, we need to synchronize the standin and the largefile, |
474 # because otherwise the largefile will get reverted. But for commit's |
474 # because otherwise the largefile will get reverted. But for commit's |