Show More
@@ -550,11 +550,11 b' def getstandinsstate(repo):' | |||||
550 |
|
550 | |||
551 | def synclfdirstate(repo, lfdirstate, lfile, normallookup): |
|
551 | def synclfdirstate(repo, lfdirstate, lfile, normallookup): | |
552 | lfstandin = standin(lfile) |
|
552 | lfstandin = standin(lfile) | |
553 | if lfstandin in repo.dirstate: |
|
553 | if lfstandin not in repo.dirstate: | |
|
554 | lfdirstate.drop(lfile) | |||
|
555 | else: | |||
554 | stat = repo.dirstate._map[lfstandin] |
|
556 | stat = repo.dirstate._map[lfstandin] | |
555 | state, mtime = stat.state, stat.mtime |
|
557 | state, mtime = stat.state, stat.mtime | |
556 | else: |
|
|||
557 | state, mtime = b'?', -1 |
|
|||
558 | if state == b'n': |
|
558 | if state == b'n': | |
559 | if normallookup or mtime < 0 or not repo.wvfs.exists(lfile): |
|
559 | if normallookup or mtime < 0 or not repo.wvfs.exists(lfile): | |
560 | # state 'n' doesn't ensure 'clean' in this case |
|
560 | # state 'n' doesn't ensure 'clean' in this case | |
@@ -567,8 +567,6 b' def synclfdirstate(repo, lfdirstate, lfi' | |||||
567 | lfdirstate.remove(lfile) |
|
567 | lfdirstate.remove(lfile) | |
568 | elif state == b'a': |
|
568 | elif state == b'a': | |
569 | lfdirstate.add(lfile) |
|
569 | lfdirstate.add(lfile) | |
570 | elif state == b'?': |
|
|||
571 | lfdirstate.drop(lfile) |
|
|||
572 |
|
570 | |||
573 |
|
571 | |||
574 | def markcommitted(orig, ctx, node): |
|
572 | def markcommitted(orig, ctx, node): |
General Comments 0
You need to be logged in to leave comments.
Login now