Show More
@@ -4145,8 +4145,8 b' def remove(ui, repo, *pats, **opts):' | |||||
4145 | ' to force removal)\n') % m.rel(f)) |
|
4145 | ' to force removal)\n') % m.rel(f)) | |
4146 | ret = 1 |
|
4146 | ret = 1 | |
4147 | for f in added: |
|
4147 | for f in added: | |
4148 |
ui.warn(_('not removing %s: file has been marked for add |
|
4148 | ui.warn(_('not removing %s: file has been marked for add' | |
4149 |
' |
|
4149 | ' (use forget to undo)\n') % m.rel(f)) | |
4150 | ret = 1 |
|
4150 | ret = 1 | |
4151 |
|
4151 | |||
4152 | for f in sorted(list): |
|
4152 | for f in sorted(list): |
@@ -29,7 +29,7 b' 00 state added, options none' | |||||
29 | $ echo b > bar |
|
29 | $ echo b > bar | |
30 | $ hg add bar |
|
30 | $ hg add bar | |
31 | $ remove bar |
|
31 | $ remove bar | |
32 |
not removing bar: file has been marked for add (use |
|
32 | not removing bar: file has been marked for add (use forget to undo) | |
33 | exit code: 1 |
|
33 | exit code: 1 | |
34 | A bar |
|
34 | A bar | |
35 | ./bar |
|
35 | ./bar |
General Comments 0
You need to be logged in to leave comments.
Login now