##// END OF EJS Templates
spelling: update
timeless@mozdev.org -
r17526:1572fd8a default
parent child Browse files
Show More
@@ -389,7 +389,7 b' def cachelfiles(ui, repo, node, filelist'
389 # If we are mid-merge, then we have to trust the standin that is in the
389 # If we are mid-merge, then we have to trust the standin that is in the
390 # working copy to have the correct hashvalue. This is because the
390 # working copy to have the correct hashvalue. This is because the
391 # original hg.merge() already updated the standin as part of the normal
391 # original hg.merge() already updated the standin as part of the normal
392 # merge process -- we just have to udpate the largefile to match.
392 # merge process -- we just have to update the largefile to match.
393 if (getattr(repo, "_ismerging", False) and
393 if (getattr(repo, "_ismerging", False) and
394 os.path.exists(repo.wjoin(lfutil.standin(lfile)))):
394 os.path.exists(repo.wjoin(lfutil.standin(lfile)))):
395 expectedhash = lfutil.readstandin(repo, lfile)
395 expectedhash = lfutil.readstandin(repo, lfile)
General Comments 0
You need to be logged in to leave comments. Login now