Mercurial > hg

diff hgext/largefiles/overrides.py @ 23706:3314664606e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 01 Jan 2015 16:47:14 -0600
parents 69cd91d04117 997a96cf6344
children 5f84695734f1
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py	Wed Dec 24 03:26:48 2014 -0800
+++ b/hgext/largefiles/overrides.py	Thu Jan 01 16:47:14 2015 -0600
@@ -496,10 +496,14 @@
 
 def mergerecordupdates(orig, repo, actions, branchmerge):
     if 'lfmr' in actions:
-        # this should be executed before 'orig', to execute 'remove'
-        # before all other actions
+        lfdirstate = lfutil.openlfdirstate(repo.ui, repo)
         for lfile, args, msg in actions['lfmr']:
+            # this should be executed before 'orig', to execute 'remove'
+            # before all other actions
             repo.dirstate.remove(lfile)
+            # make sure lfile doesn't get synclfdirstate'd as normal
+            lfdirstate.add(lfile)
+        lfdirstate.write()
 
     return orig(repo, actions, branchmerge)