equal
deleted
inserted
replaced
1398 pctx = repo['.'] |
1398 pctx = repo['.'] |
1399 for lfile in unsure + s.modified: |
1399 for lfile in unsure + s.modified: |
1400 lfileabs = repo.wvfs.join(lfile) |
1400 lfileabs = repo.wvfs.join(lfile) |
1401 if not repo.wvfs.exists(lfileabs): |
1401 if not repo.wvfs.exists(lfileabs): |
1402 continue |
1402 continue |
1403 lfhash = lfutil.hashrepofile(repo, lfile) |
1403 lfhash = lfutil.hashfile(lfileabs) |
1404 standin = lfutil.standin(lfile) |
1404 standin = lfutil.standin(lfile) |
1405 lfutil.writestandin(repo, standin, lfhash, |
1405 lfutil.writestandin(repo, standin, lfhash, |
1406 lfutil.getexecutable(lfileabs)) |
1406 lfutil.getexecutable(lfileabs)) |
1407 if (standin in pctx and |
1407 if (standin in pctx and |
1408 lfhash == lfutil.readstandin(repo, lfile, pctx)): |
1408 lfhash == lfutil.readstandin(repo, lfile, pctx)): |