equal
deleted
inserted
replaced
71 > error, |
71 > error, |
72 > extensions, |
72 > extensions, |
73 > merge, |
73 > merge, |
74 > ) |
74 > ) |
75 > |
75 > |
76 > def wraprecordupdates(orig, repo, actions, branchmerge): |
76 > def wraprecordupdates(*args): |
77 > raise error.Abort("simulated error while recording dirstateupdates") |
77 > raise error.Abort("simulated error while recording dirstateupdates") |
78 > |
78 > |
79 > def reposetup(ui, repo): |
79 > def reposetup(ui, repo): |
80 > extensions.wrapfunction(merge, 'recordupdates', wraprecordupdates) |
80 > extensions.wrapfunction(merge, 'recordupdates', wraprecordupdates) |
81 > EOF |
81 > EOF |