Show More
@@ -151,18 +151,18 b' def override_remove(orig, ui, repo, *pat' | |||||
151 |
|
151 | |||
152 | def warn(files, reason): |
|
152 | def warn(files, reason): | |
153 | for f in files: |
|
153 | for f in files: | |
154 |
ui.warn(_('not removing %s: |
|
154 | ui.warn(_('not removing %s: %s (use -f to force removal)\n') | |
155 | % (m.rel(f), reason)) |
|
155 | % (m.rel(f), reason)) | |
156 |
|
156 | |||
157 | if force: |
|
157 | if force: | |
158 | remove, forget = modified + deleted + clean, added |
|
158 | remove, forget = modified + deleted + clean, added | |
159 | elif after: |
|
159 | elif after: | |
160 | remove, forget = deleted, [] |
|
160 | remove, forget = deleted, [] | |
161 | warn(modified + added + clean, _('still exists')) |
|
161 | warn(modified + added + clean, _('file still exists')) | |
162 | else: |
|
162 | else: | |
163 | remove, forget = deleted + clean, [] |
|
163 | remove, forget = deleted + clean, [] | |
164 | warn(modified, _('is modified')) |
|
164 | warn(modified, _('file is modified')) | |
165 | warn(added, _('has been marked for add')) |
|
165 | warn(added, _('file has been marked for add')) | |
166 |
|
166 | |||
167 | for f in sorted(remove + forget): |
|
167 | for f in sorted(remove + forget): | |
168 | if ui.verbose or not m.exact(f): |
|
168 | if ui.verbose or not m.exact(f): |
General Comments 0
You need to be logged in to leave comments.
Login now