equal
deleted
inserted
replaced
68 $ cat > ../dirstateexception.py <<EOF |
68 $ cat > ../dirstateexception.py <<EOF |
69 > from __future__ import absolute_import |
69 > from __future__ import absolute_import |
70 > from mercurial import ( |
70 > from mercurial import ( |
71 > error, |
71 > error, |
72 > extensions, |
72 > extensions, |
73 > merge, |
73 > mergestate as mergestatemod, |
74 > ) |
74 > ) |
75 > |
75 > |
76 > def wraprecordupdates(*args): |
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(mergestatemod, 'recordupdates', |
|
81 > wraprecordupdates) |
81 > EOF |
82 > EOF |
82 |
83 |
83 $ hg rm a |
84 $ hg rm a |
84 $ hg commit -m 'rm a' |
85 $ hg commit -m 'rm a' |
85 $ echo "[extensions]" >> .hg/hgrc |
86 $ echo "[extensions]" >> .hg/hgrc |