Show More
@@ -2083,7 +2083,7 b' def remove(ui, repo, *pats, **opts):' | |||||
2083 | entire project history. If the files still exist in the working |
|
2083 | entire project history. If the files still exist in the working | |
2084 | directory, they will be deleted from it. If invoked with --after, |
|
2084 | directory, they will be deleted from it. If invoked with --after, | |
2085 | files are marked as removed, but not actually unlinked unless --force |
|
2085 | files are marked as removed, but not actually unlinked unless --force | |
2086 |
is also given. Without |
|
2086 | is also given. Without exact file names, --after will only mark | |
2087 | files as removed if they are no longer in the working directory. |
|
2087 | files as removed if they are no longer in the working directory. | |
2088 |
|
2088 | |||
2089 | This command schedules the files to be removed at the next commit. |
|
2089 | This command schedules the files to be removed at the next commit. | |
@@ -2111,7 +2111,7 b' def remove(ui, repo, *pats, **opts):' | |||||
2111 | reason = _('has been marked for add (use -f to force removal)') |
|
2111 | reason = _('has been marked for add (use -f to force removal)') | |
2112 | elif abs in unknown: |
|
2112 | elif abs in unknown: | |
2113 | reason = _('is not managed') |
|
2113 | reason = _('is not managed') | |
2114 |
elif opts['after'] and not |
|
2114 | elif opts['after'] and not exact and abs not in deleted: | |
2115 | continue |
|
2115 | continue | |
2116 | elif abs in removed: |
|
2116 | elif abs in removed: | |
2117 | continue |
|
2117 | continue |
@@ -23,18 +23,21 b' hg add a' | |||||
23 | hg rm a |
|
23 | hg rm a | |
24 | hg rm -f a |
|
24 | hg rm -f a | |
25 | echo b > b |
|
25 | echo b > b | |
26 | echo c > c |
|
26 | mkdir c | |
|
27 | echo d > c/d | |||
27 | hg ci -A -m 3 -d "1000001 0" |
|
28 | hg ci -A -m 3 -d "1000001 0" | |
28 | echo c >> b |
|
29 | echo c >> b | |
29 | hg rm b |
|
30 | hg rm b | |
30 | hg rm -f b |
|
31 | hg rm -f b | |
31 | hg rm -A c |
|
32 | hg rm -A c/d | |
32 | hg st |
|
33 | hg st | |
33 | cat c |
|
34 | cat c/d | |
34 | hg revert c |
|
35 | hg revert c | |
35 | hg rm -A |
|
36 | hg rm -A | |
36 | hg st |
|
37 | hg st | |
37 | rm c |
|
38 | hg rm -A c | |
|
39 | hg st | |||
|
40 | rm c/d | |||
38 | hg rm -A |
|
41 | hg rm -A | |
39 | hg st |
|
42 | hg st | |
40 |
|
43 |
@@ -52,13 +52,15 b' diff -r 8ba83d44753d -r a1fce69c50d9 foo' | |||||
52 | not removing a: file has been marked for add (use -f to force removal) |
|
52 | not removing a: file has been marked for add (use -f to force removal) | |
53 | adding a |
|
53 | adding a | |
54 | adding b |
|
54 | adding b | |
55 | adding c |
|
55 | adding c/d | |
56 | not removing b: file is modified (use -f to force removal) |
|
56 | not removing b: file is modified (use -f to force removal) | |
57 | R b |
|
57 | R b | |
58 | R c |
|
58 | R c/d | |
59 | c |
|
59 | d | |
|
60 | undeleting c/d | |||
|
61 | R b | |||
60 | R b |
|
62 | R b | |
61 | removing c |
|
63 | removing c/d | |
62 | R b |
|
64 | R b | |
63 | R c |
|
65 | R c/d | |
64 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
66 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
General Comments 0
You need to be logged in to leave comments.
Login now