diff -r 8ecbe55fd09d -r 0cb34b3991f8 hgext/largefiles/overrides.py --- a/hgext/largefiles/overrides.py Wed Jul 23 00:10:24 2014 +0900 +++ b/hgext/largefiles/overrides.py Wed Jul 23 00:10:24 2014 +0900 @@ -667,7 +667,13 @@ newstandins = lfutil.getstandinsstate(repo) filelist = lfutil.getlfilestoupdate(oldstandins, newstandins) - lfcommands.updatelfiles(ui, repo, filelist, printmessage=False) + # lfdirstate should be 'normallookup'-ed for updated files, + # because reverting doesn't touch dirstate for 'normal' files + # when target revision is explicitly specified: in such case, + # 'n' and valid timestamp in dirstate doesn't ensure 'clean' + # of target (standin) file. + lfcommands.updatelfiles(ui, repo, filelist, printmessage=False, + normallookup=True) finally: wlock.release()