hgext/absorb.py
changeset 49072 3cd57e2be49b
parent 49027 0f0e3830c099
child 49284 d44e3c45f0e4
--- a/hgext/absorb.py	Wed Apr 13 14:40:11 2022 +0100
+++ b/hgext/absorb.py	Wed Apr 13 07:58:49 2022 -0700
@@ -1045,6 +1045,10 @@
         origchunks = patch.parsepatch(diff)
         chunks = cmdutil.recordfilter(ui, origchunks, matcher)[0]
         targetctx = overlaydiffcontext(stack[-1], chunks)
+    if opts.get(b'edit_lines'):
+        # If we're going to open the editor, don't ask the user to confirm
+        # first
+        opts[b'apply_changes'] = True
     fm = None
     if opts.get(b'print_changes') or not opts.get(b'apply_changes'):
         fm = ui.formatter(b'absorb', opts)