Show More
@@ -2509,8 +2509,8 def remove(ui, repo, m, prefix, after, f | |||||
2509 | for f in added: |
|
2509 | for f in added: | |
2510 | count += 1 |
|
2510 | count += 1 | |
2511 | ui.progress(_('skipping'), count, total=total, unit=_('files')) |
|
2511 | ui.progress(_('skipping'), count, total=total, unit=_('files')) | |
2512 |
warnings.append(_( |
|
2512 | warnings.append(_("not removing %s: file has been marked for add" | |
2513 |
' |
|
2513 | " (use 'hg forget' to undo add)\n") % m.rel(f)) | |
2514 | ret = 1 |
|
2514 | ret = 1 | |
2515 | ui.progress(_('skipping'), None) |
|
2515 | ui.progress(_('skipping'), None) | |
2516 |
|
2516 |
@@ -112,7 +112,7 Test messages and exit codes for remove | |||||
112 | normalnew already tracked! |
|
112 | normalnew already tracked! | |
113 | $ hg remove normalnew largenew |
|
113 | $ hg remove normalnew largenew | |
114 | not removing largenew: file is untracked |
|
114 | not removing largenew: file is untracked | |
115 | not removing normalnew: file has been marked for add (use forget to undo) |
|
115 | not removing normalnew: file has been marked for add (use 'hg forget' to undo add) | |
116 | [1] |
|
116 | [1] | |
117 | $ rm normalnew largenew |
|
117 | $ rm normalnew largenew | |
118 | $ hg up -Cq |
|
118 | $ hg up -Cq |
@@ -50,7 +50,7 00 state added, options none | |||||
50 | \r (no-eol) (esc) |
|
50 | \r (no-eol) (esc) | |
51 | skipping [===========================================>] 1/1\r (no-eol) (esc) |
|
51 | skipping [===========================================>] 1/1\r (no-eol) (esc) | |
52 | \r (no-eol) (esc) |
|
52 | \r (no-eol) (esc) | |
53 | not removing bar: file has been marked for add (use forget to undo) |
|
53 | not removing bar: file has been marked for add (use 'hg forget' to undo add) | |
54 | exit code: 1 |
|
54 | exit code: 1 | |
55 | A bar |
|
55 | A bar | |
56 | ./bar |
|
56 | ./bar |
General Comments 0
You need to be logged in to leave comments.
Login now