equal
deleted
inserted
replaced
64 |
64 |
65 Verify that exceptions during a dirstate change leave the dirstate |
65 Verify that exceptions during a dirstate change leave the dirstate |
66 coherent (issue4353) |
66 coherent (issue4353) |
67 |
67 |
68 $ cat > ../dirstateexception.py <<EOF |
68 $ cat > ../dirstateexception.py <<EOF |
69 > from mercurial import merge, extensions, util |
69 > from mercurial import merge, extensions, error |
70 > |
70 > |
71 > def wraprecordupdates(orig, repo, actions, branchmerge): |
71 > def wraprecordupdates(orig, repo, actions, branchmerge): |
72 > raise util.Abort("simulated error while recording dirstateupdates") |
72 > raise error.Abort("simulated error while recording dirstateupdates") |
73 > |
73 > |
74 > def reposetup(ui, repo): |
74 > def reposetup(ui, repo): |
75 > extensions.wrapfunction(merge, 'recordupdates', wraprecordupdates) |
75 > extensions.wrapfunction(merge, 'recordupdates', wraprecordupdates) |
76 > EOF |
76 > EOF |
77 |
77 |