Show More
@@ -575,10 +575,14 b' def updatestandinsbymatch(repo, match):' | |||
|
575 | 575 | fstandin = standin(f) |
|
576 | 576 | |
|
577 | 577 | # For largefiles, only one of the normal and standin should be |
|
578 | # committed (except if one of them is a remove). | |
|
578 | # committed (except if one of them is a remove). In the case of a | |
|
579 | # standin removal, drop the normal file if it is unknown to dirstate. | |
|
579 | 580 | # Thus, skip plain largefile names but keep the standin. |
|
580 |
if |
|
|
581 |
|
|
|
581 | if f in lfiles or fstandin in standins: | |
|
582 | if repo.dirstate[fstandin] != 'r': | |
|
583 | if repo.dirstate[f] != 'r': | |
|
584 | continue | |
|
585 | elif repo.dirstate[f] == '?': | |
|
582 | 586 | continue |
|
583 | 587 | |
|
584 | 588 | actualfiles.append(f) |
General Comments 0
You need to be logged in to leave comments.
Login now