Show More
@@ -4880,8 +4880,7 b' def remove(ui, repo, *pats, **opts):' | |||||
4880 | elif after: |
|
4880 | elif after: | |
4881 | list = deleted |
|
4881 | list = deleted | |
4882 | for f in modified + added + clean: |
|
4882 | for f in modified + added + clean: | |
4883 |
ui.warn(_('not removing %s: file still exists |
|
4883 | ui.warn(_('not removing %s: file still exists\n') % m.rel(f)) | |
4884 | ' to force removal)\n') % m.rel(f)) |
|
|||
4885 | ret = 1 |
|
4884 | ret = 1 | |
4886 | else: |
|
4885 | else: | |
4887 | list = deleted + clean |
|
4886 | list = deleted + clean |
@@ -107,7 +107,7 b' 20 state added, options -A' | |||||
107 | $ echo b > bar |
|
107 | $ echo b > bar | |
108 | $ hg add bar |
|
108 | $ hg add bar | |
109 | $ remove -A bar |
|
109 | $ remove -A bar | |
110 |
not removing bar: file still exists |
|
110 | not removing bar: file still exists | |
111 | exit code: 1 |
|
111 | exit code: 1 | |
112 | A bar |
|
112 | A bar | |
113 | ./bar |
|
113 | ./bar | |
@@ -117,7 +117,7 b' 20 state added, options -A' | |||||
117 | 21 state clean, options -A |
|
117 | 21 state clean, options -A | |
118 |
|
118 | |||
119 | $ remove -A foo |
|
119 | $ remove -A foo | |
120 |
not removing foo: file still exists |
|
120 | not removing foo: file still exists | |
121 | exit code: 1 |
|
121 | exit code: 1 | |
122 | ? bar |
|
122 | ? bar | |
123 | ./bar |
|
123 | ./bar | |
@@ -128,7 +128,7 b' 22 state modified, options -A' | |||||
128 |
|
128 | |||
129 | $ echo b >> foo |
|
129 | $ echo b >> foo | |
130 | $ remove -A foo |
|
130 | $ remove -A foo | |
131 |
not removing foo: file still exists |
|
131 | not removing foo: file still exists | |
132 | exit code: 1 |
|
132 | exit code: 1 | |
133 | M foo |
|
133 | M foo | |
134 | ? bar |
|
134 | ? bar | |
@@ -220,7 +220,7 b' dir, options -A' | |||||
220 |
|
220 | |||
221 | $ rm test/bar |
|
221 | $ rm test/bar | |
222 | $ remove -A test |
|
222 | $ remove -A test | |
223 |
not removing test/foo: file still exists ( |
|
223 | not removing test/foo: file still exists (glob) | |
224 | removing test/bar (glob) |
|
224 | removing test/bar (glob) | |
225 | exit code: 1 |
|
225 | exit code: 1 | |
226 | R test/bar |
|
226 | R test/bar |
General Comments 0
You need to be logged in to leave comments.
Login now