equal
deleted
inserted
replaced
100 overrides.overridecalculateupdates) |
100 overrides.overridecalculateupdates) |
101 entry = extensions.wrapfunction(merge, 'recordupdates', |
101 entry = extensions.wrapfunction(merge, 'recordupdates', |
102 overrides.mergerecordupdates) |
102 overrides.mergerecordupdates) |
103 entry = extensions.wrapfunction(merge, 'update', |
103 entry = extensions.wrapfunction(merge, 'update', |
104 overrides.mergeupdate) |
104 overrides.mergeupdate) |
105 entry = extensions.wrapfunction(filemerge, 'filemerge', |
105 entry = extensions.wrapfunction(filemerge, '_filemerge', |
106 overrides.overridefilemerge) |
106 overrides.overridefilemerge) |
107 entry = extensions.wrapfunction(cmdutil, 'copy', |
107 entry = extensions.wrapfunction(cmdutil, 'copy', |
108 overrides.overridecopy) |
108 overrides.overridecopy) |
109 |
109 |
110 # Summary calls dirty on the subrepos |
110 # Summary calls dirty on the subrepos |