Show More
@@ -971,7 +971,7 b' def overrideforget(orig, ui, repo, *pats' | |||||
971 |
|
971 | |||
972 | for f in forget: |
|
972 | for f in forget: | |
973 | if lfutil.standin(f) not in repo.dirstate and not \ |
|
973 | if lfutil.standin(f) not in repo.dirstate and not \ | |
974 |
o |
|
974 | repo.wvfs.isdir(lfutil.standin(f)): | |
975 | ui.warn(_('not removing %s: file is already untracked\n') |
|
975 | ui.warn(_('not removing %s: file is already untracked\n') | |
976 | % m.rel(f)) |
|
976 | % m.rel(f)) | |
977 | result = 1 |
|
977 | result = 1 |
@@ -2037,9 +2037,9 b' def forget(ui, repo, match, prefix, expl' | |||||
2037 |
|
2037 | |||
2038 | if not explicitonly: |
|
2038 | if not explicitonly: | |
2039 | for f in match.files(): |
|
2039 | for f in match.files(): | |
2040 |
if f not in repo.dirstate and not o |
|
2040 | if f not in repo.dirstate and not repo.wvfs.isdir(f): | |
2041 | if f not in forgot: |
|
2041 | if f not in forgot: | |
2042 |
if o |
|
2042 | if repo.wvfs.exists(f): | |
2043 | ui.warn(_('not removing %s: ' |
|
2043 | ui.warn(_('not removing %s: ' | |
2044 | 'file is already untracked\n') |
|
2044 | 'file is already untracked\n') | |
2045 | % match.rel(join(f))) |
|
2045 | % match.rel(join(f))) |
General Comments 0
You need to be logged in to leave comments.
Login now