hgext/largefiles/lfcommands.py
branchstable
changeset 23696 1265a3a71d75
parent 22296 650b5b6e75ed
child 23706 3314664606e6
equal deleted inserted replaced
23695:997a96cf6344 23696:1265a3a71d75
   511 
   511 
   512             updated += update1
   512             updated += update1
   513 
   513 
   514             lfutil.synclfdirstate(repo, lfdirstate, lfile, normallookup)
   514             lfutil.synclfdirstate(repo, lfdirstate, lfile, normallookup)
   515 
   515 
   516         if filelist is not None:
       
   517             # If "local largefile" is chosen at file merging, it is
       
   518             # not listed in "filelist" (= dirstate syncing is
       
   519             # omitted), because the standin file is not changed before and
       
   520             # after merging.
       
   521             # But the status of such files may have to be changed by
       
   522             # merging. For example, locally modified ("M") largefile
       
   523             # has to become re-added("A"), if it is "normal" file in
       
   524             # the target revision of linear-merging.
       
   525             for lfile in lfdirstate:
       
   526                 if lfile not in filelist:
       
   527                     lfutil.synclfdirstate(repo, lfdirstate, lfile, True)
       
   528 
       
   529         lfdirstate.write()
   516         lfdirstate.write()
   530         if printmessage and lfiles:
   517         if printmessage and lfiles:
   531             ui.status(_('%d largefiles updated, %d removed\n') % (updated,
   518             ui.status(_('%d largefiles updated, %d removed\n') % (updated,
   532                 removed))
   519                 removed))
   533     finally:
   520     finally: