##// END OF EJS Templates
dirstate-guard: remove its usage in `backout`...
marmoute -
r50960:927da152 default
parent child Browse files
Show More
@@ -28,7 +28,6 b' from . import ('
28 copies,
28 copies,
29 debugcommands as debugcommandsmod,
29 debugcommands as debugcommandsmod,
30 destutil,
30 destutil,
31 dirstateguard,
32 discovery,
31 discovery,
33 encoding,
32 encoding,
34 error,
33 error,
@@ -824,7 +823,7 b' def _dobackout(ui, repo, node=None, rev='
824 bheads = repo.branchheads(branch)
823 bheads = repo.branchheads(branch)
825 rctx = scmutil.revsingle(repo, hex(parent))
824 rctx = scmutil.revsingle(repo, hex(parent))
826 if not opts.get(b'merge') and op1 != node:
825 if not opts.get(b'merge') and op1 != node:
827 with dirstateguard.dirstateguard(repo, b'backout'):
826 with repo.transaction(b"backout"):
828 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
827 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
829 with ui.configoverride(overrides, b'backout'):
828 with ui.configoverride(overrides, b'backout'):
830 stats = mergemod.back_out(ctx, parent=repo[parent])
829 stats = mergemod.back_out(ctx, parent=repo[parent])
General Comments 0
You need to be logged in to leave comments. Login now