Mercurial > hg

comparison hgext/largefiles/lfcommands.py @ 17526:1572fd8af69d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
spelling: update
author timeless@mozdev.org
date Fri, 17 Aug 2012 13:58:19 -0700
parents e51d4aedace9
children 31f32a96e1e3
comparison
equal deleted inserted replaced
17525:e327fd6edb14 17526:1572fd8af69d
387 387
388 for lfile in lfiles: 388 for lfile in lfiles:
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)
396 else: 396 else:
397 expectedhash = repo[node][lfutil.standin(lfile)].data().strip() 397 expectedhash = repo[node][lfutil.standin(lfile)].data().strip()