Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/largefiles/lfcommands.py
branchstable
changeset 19160 0848be1f1aad
parent 19089 0509ae083ec1
child 20060 750d04e747aa 
--- a/hgext/largefiles/lfcommands.py	Tue May 07 05:04:11 2013 +0900
+++ b/hgext/largefiles/lfcommands.py	Tue May 07 05:04:11 2013 +0900
@@ -502,7 +502,8 @@
         # lfile is added to the repository again. This happens when a
         # largefile is converted back to a normal file: the standin
         # disappears, but a new (normal) file appears as the lfile.
-        if os.path.exists(abslfile) and lfile not in repo[None]:
+        if (os.path.exists(abslfile) and
+            repo.dirstate.normalize(lfile) not in repo[None]):
             util.unlinkpath(abslfile)
             ret = -1
     state = repo.dirstate[lfutil.standin(lfile)]
mercurial