##// END OF EJS Templates
forget: show warning messages for forgetting in subrepo correctly...
FUJIWARA Katsunori -
r16070:f11eee00 stable
parent child Browse files
Show More
@@ -1224,8 +1224,8 b' def forget(ui, repo, match, prefix, expl'
1224 1224 ui.status(_("skipping missing subrepository: %s\n")
1225 1225 % join(subpath))
1226 1226
1227 for f in match.files():
1228 if match.exact(f) or not explicitonly:
1227 if not explicitonly:
1228 for f in match.files():
1229 1229 if f not in repo.dirstate and not os.path.isdir(match.rel(join(f))):
1230 1230 if f not in forgot:
1231 1231 if os.path.exists(match.rel(join(f))):
@@ -195,10 +195,14 b' Test explicit path commands within subre'
195 195 $ hg add foo/bar/z2.txt
196 196 $ hg status -S
197 197 A foo/bar/z2.txt
198 This is expected to forget the file, but is currently broken
199 198 $ hg forget foo/bar/z2.txt
200 199 $ hg status -S
201 200 ? foo/bar/z2.txt
201 $ hg forget foo/bar/z2.txt
202 not removing foo/bar/z2.txt: file is already untracked
203 [1]
204 $ hg status -S
205 ? foo/bar/z2.txt
202 206 $ rm foo/bar/z2.txt
203 207
204 208 Log with the relationships between repo and its subrepo:
General Comments 0
You need to be logged in to leave comments. Login now