##// END OF EJS Templates
largefiles: override merge.emptyactions() to include `lfmr`...
Pulkit Goyal -
r45854:ab57793d default
parent child Browse files
Show More
@@ -495,6 +495,14 b' def overridedebugstate(orig, ui, repo, *'
495 orig(ui, repo, *pats, **opts)
495 orig(ui, repo, *pats, **opts)
496
496
497
497
498 # Register the `lfmr` merge action in emptyactions() return type
499 @eh.wrapfunction(merge, b'emptyactions')
500 def overrideemptyactions(origfn):
501 ret = origfn()
502 ret[b'lfmr'] = []
503 return ret
504
505
498 # Before starting the manifest merge, merge.updates will call
506 # Before starting the manifest merge, merge.updates will call
499 # _checkunknownfile to check if there are any files in the merged-in
507 # _checkunknownfile to check if there are any files in the merged-in
500 # changeset that collide with unknown files in the working copy.
508 # changeset that collide with unknown files in the working copy.
General Comments 0
You need to be logged in to leave comments. Login now