Mercurial > hg-stable
changeset 15983:32b9aee3602c stable
largefiles: fix revert on missing largefile (issue3217)
| author | Na'Tosha Bard <natosha@unity3d.com> |
|---|---|
| date | Wed, 25 Jan 2012 16:52:16 +0100 |
| parents | bf502ccc46d7 |
| children | 894f83a35653 |
| files | hgext/largefiles/overrides.py tests/test-largefiles.t |
| diffstat | 2 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Wed Jan 25 14:10:01 2012 +0100 +++ b/hgext/largefiles/overrides.py Wed Jan 25 16:52:16 2012 +0100 @@ -535,6 +535,8 @@ lfutil.lfdirstate_status(lfdirstate, repo, repo['.'].rev()) for lfile in modified: lfutil.updatestandin(repo, lfutil.standin(lfile)) + for lfile in missing: + os.unlink(repo.wjoin(lfutil.standin(lfile))) try: ctx = repo[opts.get('rev')]
--- a/tests/test-largefiles.t Wed Jan 25 14:10:01 2012 +0100 +++ b/tests/test-largefiles.t Wed Jan 25 16:52:16 2012 +0100 @@ -564,6 +564,8 @@ $ echo hack3 >> normal3 $ echo hack4 >> sub/normal4 $ echo hack4 >> sub/large4 + $ rm sub2/large6 + $ hg revert sub2/large6 $ hg rm sub2/large6 $ echo new >> sub2/large8 $ hg add --large sub2/large8