Mercurial > hg
diff hgext/largefiles/reposetup.py @ 15630:e6868bd17f24
merge with stable
author | Martin Geisler <mg@aragost.com> |
---|---|
date | Fri, 09 Dec 2011 17:58:12 +0100 |
parents | 2b40513384ca 5b66e55c0d93 |
children | 93c77d5b9752 |
line wrap: on
line diff
--- 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: