##// END OF EJS Templates
Fix rm -A with no patterns, which I just broke.
Brendan Cully -
r4393:cf5f35ec default
parent child Browse files
Show More
@@ -2083,7 +2083,8 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.
2086 is also given. Without an explicit pattern, --after will only mark
2087 files as removed if they are no longer in the working directory.
2087
2088
2088 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.
2089 To undo a remove before that, see hg revert.
2090 To undo a remove before that, see hg revert.
@@ -2110,6 +2111,8 def remove(ui, repo, *pats, **opts):
2110 reason = _('has been marked for add (use -f to force removal)')
2111 reason = _('has been marked for add (use -f to force removal)')
2111 elif abs in unknown:
2112 elif abs in unknown:
2112 reason = _('is not managed')
2113 reason = _('is not managed')
2114 elif opts['after'] and not pats and abs not in deleted:
2115 continue
2113 elif abs in removed:
2116 elif abs in removed:
2114 continue
2117 continue
2115 if reason:
2118 if reason:
@@ -29,7 +29,14 echo c >> b
29 hg rm b
29 hg rm b
30 hg rm -f b
30 hg rm -f b
31 hg rm -A c
31 hg rm -A c
32 hg st
32 cat c
33 cat c
34 hg revert c
35 hg rm -A
36 hg st
37 rm c
38 hg rm -A
39 hg st
33
40
34 cd ..
41 cd ..
35 hg clone a b
42 hg clone a b
@@ -54,5 +54,11 adding a
54 adding b
54 adding b
55 adding c
55 adding c
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
58 R c
57 c
59 c
60 R b
61 removing c
62 R b
63 R c
58 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
64 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