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
branchstable
changeset 15629 5b66e55c0d93
parent 15385 4439ec496378
child 15630 e6868bd17f24
child 15663 9036c7d106bf 
--- a/hgext/largefiles/reposetup.py	Tue Dec 06 15:50:28 2011 +0100
+++ b/hgext/largefiles/reposetup.py	Fri Dec 09 17:34:58 2011 +0100
@@ -156,7 +156,11 @@
                                 ignored, clean) = s
                         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