##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

largefile: use `update_file` for `synclfdirstate` "m" case...
marmoute -
r48525:1f3a87a7 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -569,7 +569,9 b' def synclfdirstate(repo, lfdirstate, lfi'
569 else:
569 else:
570 lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=True)
570 lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=True)
571 elif state == b'm':
571 elif state == b'm':
572 lfdirstate.normallookup(lfile)
572 lfdirstate.update_file(
573 lfile, p1_tracked=True, wc_tracked=True, merged=True
574 )
573 elif state == b'r':
575 elif state == b'r':
574 lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=False)
576 lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=False)
575 elif state == b'a':
577 elif state == b'a':
General Comments 0
You need to be logged in to leave comments. Login now