Show More
@@ -764,9 +764,10 b' def overriderevert(orig, ui, repo, ctx, ' | |||||
764 | False) |
|
764 | False) | |
765 |
|
765 | |||
766 | def tostandin(f): |
|
766 | def tostandin(f): | |
767 |
|
|
767 | standin = lfutil.standin(f) | |
768 |
|
|
768 | if standin in mctx: | |
769 | elif lfutil.standin(f) in repo[None] or lfdirstate[f] == 'r': |
|
769 | return standin | |
|
770 | elif standin in repo[None] or lfdirstate[f] == 'r': | |||
770 | return None |
|
771 | return None | |
771 | return f |
|
772 | return f | |
772 | m._files = [tostandin(f) for f in m._files] |
|
773 | m._files = [tostandin(f) for f in m._files] |
General Comments 0
You need to be logged in to leave comments.
Login now