Mercurial > hg
diff hgext/largefiles/uisetup.py @ 20638:b228ad1f79d7
largefiles: override calculateupdates instead of manifestmerge
That will give calculateupdates a purpose in life ... and be convenient later.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Sun, 02 Mar 2014 18:30:41 +0100 |
parents | fb6e87d93948 |
children | ca7a57464fb3 |
line wrap: on
line diff
--- a/hgext/largefiles/uisetup.py Tue Feb 25 20:28:40 2014 +0100 +++ b/hgext/largefiles/uisetup.py Sun Mar 02 18:30:41 2014 +0100 @@ -96,8 +96,8 @@ overrides.overridecat) entry = extensions.wrapfunction(merge, '_checkunknownfile', overrides.overridecheckunknownfile) - entry = extensions.wrapfunction(merge, 'manifestmerge', - overrides.overridemanifestmerge) + entry = extensions.wrapfunction(merge, 'calculateupdates', + overrides.overridecalculateupdates) entry = extensions.wrapfunction(filemerge, 'filemerge', overrides.overridefilemerge) entry = extensions.wrapfunction(cmdutil, 'copy',