Mercurial > hg
comparison hgext/largefiles/lfcommands.py @ 15905:634d49a8b6db
largefiles: correctly handle newly added largefile on other side of merge
author | Na'Tosha Bard <natosha@unity3d.com> |
---|---|
date | Mon, 16 Jan 2012 19:45:35 +0100 |
parents | 3ecce805ac13 |
children | 8435fa20dff9 |
comparison
equal
deleted
inserted
replaced
15904:7d28d6a67dd3 | 15905:634d49a8b6db |
---|---|
377 for lfile in lfiles: | 377 for lfile in lfiles: |
378 # If we are mid-merge, then we have to trust the standin that is in the | 378 # If we are mid-merge, then we have to trust the standin that is in the |
379 # working copy to have the correct hashvalue. This is because the | 379 # working copy to have the correct hashvalue. This is because the |
380 # original hg.merge() already updated the standin as part of the normal | 380 # original hg.merge() already updated the standin as part of the normal |
381 # merge process -- we just have to udpate the largefile to match. | 381 # merge process -- we just have to udpate the largefile to match. |
382 if getattr(repo, "_ismerging", False): | 382 if (getattr(repo, "_ismerging", False) and |
383 os.path.exists(repo.wjoin(lfutil.standin(lfile)))): | |
383 expectedhash = lfutil.readstandin(repo, lfile) | 384 expectedhash = lfutil.readstandin(repo, lfile) |
384 else: | 385 else: |
385 expectedhash = repo[node][lfutil.standin(lfile)].data().strip() | 386 expectedhash = repo[node][lfutil.standin(lfile)].data().strip() |
386 | 387 |
387 # if it exists and its hash matches, it might have been locally | 388 # if it exists and its hash matches, it might have been locally |