--- a/hgext/largefiles/reposetup.py	Fri Oct 17 18:56:12 2014 +0200
+++ b/hgext/largefiles/reposetup.py	Wed Oct 15 05:08:56 2014 +0200
@@ -90,15 +90,6 @@
             working = ctx2.rev() is None
             parentworking = working and ctx1 == self['.']
 
-            def inctx(file, ctx):
-                try:
-                    if ctx.rev() is None:
-                        return file in ctx.manifest()
-                    ctx[file]
-                    return True
-                except KeyError:
-                    return False
-
             if match is None:
                 match = match_.always(self.root, self.getcwd())
 
@@ -182,7 +173,7 @@
 
                         for lfile in tocheck:
                             standin = lfutil.standin(lfile)
-                            if inctx(standin, ctx1):
+                            if standin in ctx1:
                                 if ctx1[standin].data().strip() != \
                                         lfutil.hashfile(self.wjoin(lfile)):
                                     modified.append(lfile)