mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
merge with stable
This commit is contained in:
commit
b4e070d32e
@ -2240,6 +2240,12 @@ def forget(ui, repo, match, prefix, explicitonly):
|
||||
if f not in repo.dirstate and not repo.wvfs.isdir(f):
|
||||
if f not in forgot:
|
||||
if repo.wvfs.exists(f):
|
||||
# Don't complain if the exact case match wasn't given.
|
||||
# But don't do this until after checking 'forgot', so
|
||||
# that subrepo files aren't normalized, and this op is
|
||||
# purely from data cached by the status walk above.
|
||||
if repo.dirstate.normalize(f) in repo.dirstate:
|
||||
continue
|
||||
ui.warn(_('not removing %s: '
|
||||
'file is already untracked\n')
|
||||
% match.rel(f))
|
||||
|
@ -179,6 +179,9 @@ Test that adding a directory doesn't require case matching (issue4578)
|
||||
$ hg add -v capsdir1/capsdir
|
||||
adding CapsDir1/CapsDir/AbC.txt (glob)
|
||||
adding CapsDir1/CapsDir/SubDir/Def.txt (glob)
|
||||
|
||||
$ hg forget capsdir1/capsdir/abc.txt
|
||||
removing CapsDir1/CapsDir/AbC.txt (glob)
|
||||
#endif
|
||||
|
||||
$ cd ..
|
||||
|
Loading…
Reference in New Issue
Block a user