Show More
@@ -620,7 +620,6 b' class dirstate(object):' | |||
|
620 | 620 | st = lstat(join(nf)) |
|
621 | 621 | kind = getkind(st.st_mode) |
|
622 | 622 | if kind == dirkind: |
|
623 | skipstep3 = False | |
|
624 | 623 | if nf in dmap: |
|
625 | 624 | #file deleted on disk but still in dirstate |
|
626 | 625 | results[nf] = None |
@@ -643,11 +642,11 b' class dirstate(object):' | |||
|
643 | 642 | if matchedir: |
|
644 | 643 | matchedir(nf) |
|
645 | 644 | dirsnotfound.append(nf) |
|
646 | skipstep3 = False | |
|
647 | 645 | break |
|
648 | 646 | else: |
|
649 | 647 | badfn(ff, inst.strerror) |
|
650 | 648 | |
|
649 | skipstep3 = skipstep3 and not (work or dirsnotfound) | |
|
651 | 650 | work = [d for d in work if not dirignore(d)] |
|
652 | 651 | wadd = work.append |
|
653 | 652 |
General Comments 0
You need to be logged in to leave comments.
Login now