# HG changeset patch # User Na'Tosha Bard # Date 1327506736 -3600 # Node ID 32b9aee3602ca530a5caaa8842c69568b8a695c3 # Parent bf502ccc46d76a3fd53ecef5c69388741c5f7f23 largefiles: fix revert on missing largefile (issue3217) diff -r bf502ccc46d7 -r 32b9aee3602c hgext/largefiles/overrides.py --- 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')] diff -r bf502ccc46d7 -r 32b9aee3602c tests/test-largefiles.t --- 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