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/reposetup.py
changeset 15630 e6868bd17f24
parent 15628 2b40513384ca
parent 15629 5b66e55c0d93
child 15653 93c77d5b9752 
--- a/hgext/largefiles/reposetup.py	Fri Dec 09 17:34:57 2011 +0100
+++ b/hgext/largefiles/reposetup.py	Fri Dec 09 17:58:12 2011 +0100
@@ -166,7 +166,11 @@
                         unknown = set(result[4]).difference(lfiles)
                         if parentworking:
                             for lfile in unsure:
-                                if ctx1[lfutil.standin(lfile)].data().strip() \
+                                standin = lfutil.standin(lfile)
+                                if standin not in ctx1:
+                                    # from second parent
+                                    modified.append(lfile)
+                                elif ctx1[standin].data().strip() \
                                         != lfutil.hashfile(self.wjoin(lfile)):
                                     modified.append(lfile)
                                 else:
mercurial