Mercurial > hg
comparison hgext/largefiles/overrides.py @ 23706:3314664606e6
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 01 Jan 2015 16:47:14 -0600 |
parents | 69cd91d04117 997a96cf6344 |
children | 5f84695734f1 |
comparison
equal
deleted
inserted
replaced
23705:28a302e9225d | 23706:3314664606e6 |
---|---|
494 | 494 |
495 return actions, diverge, renamedelete | 495 return actions, diverge, renamedelete |
496 | 496 |
497 def mergerecordupdates(orig, repo, actions, branchmerge): | 497 def mergerecordupdates(orig, repo, actions, branchmerge): |
498 if 'lfmr' in actions: | 498 if 'lfmr' in actions: |
499 # this should be executed before 'orig', to execute 'remove' | 499 lfdirstate = lfutil.openlfdirstate(repo.ui, repo) |
500 # before all other actions | |
501 for lfile, args, msg in actions['lfmr']: | 500 for lfile, args, msg in actions['lfmr']: |
501 # this should be executed before 'orig', to execute 'remove' | |
502 # before all other actions | |
502 repo.dirstate.remove(lfile) | 503 repo.dirstate.remove(lfile) |
504 # make sure lfile doesn't get synclfdirstate'd as normal | |
505 lfdirstate.add(lfile) | |
506 lfdirstate.write() | |
503 | 507 |
504 return orig(repo, actions, branchmerge) | 508 return orig(repo, actions, branchmerge) |
505 | 509 |
506 | 510 |
507 # Override filemerge to prompt the user about how they wish to merge | 511 # Override filemerge to prompt the user about how they wish to merge |