Stefan Kangas <stefan@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.Received: (at submit) by debbugs.gnu.org; 7 Sep 2021 19:10:39 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 07 15:10:39 2021 Received: from localhost ([127.0.0.1]:57756 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1mNgUK-0005Fn-Vo for submit <at> debbugs.gnu.org; Tue, 07 Sep 2021 15:10:39 -0400 Received: from lists.gnu.org ([209.51.188.17]:39538) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mtbar131@HIDDEN>) id 1mNgUJ-0005Fg-91 for submit <at> debbugs.gnu.org; Tue, 07 Sep 2021 15:10:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34460) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <mtbar131@HIDDEN>) id 1mNgUI-0004Co-QA for bug-gnu-emacs@HIDDEN; Tue, 07 Sep 2021 15:10:31 -0400 Received: from mail-yb1-xb36.google.com ([2607:f8b0:4864:20::b36]:33425) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <mtbar131@HIDDEN>) id 1mNgUF-0002YZ-7s for bug-gnu-emacs@HIDDEN; Tue, 07 Sep 2021 15:10:30 -0400 Received: by mail-yb1-xb36.google.com with SMTP id e133so698791ybh.0 for <bug-gnu-emacs@HIDDEN>; Tue, 07 Sep 2021 12:10:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:from:date:message-id:subject:to; bh=7F5kMVNWPDK3GXVEki7MgTEGk69/u+hsKDKuubMf3w8=; b=h5a8mokVA0EB9FGaqYDpP+wPDiz74P9J32h+DQVO/T3HWj4KJW4hH1y10weCDD/Ovg 6gXXpF/KoPxxoJfcikHaz1+8wJ3CjigcB/2HFdBLwSRVRDznC6dXVKxrEgbwBmLEluZK XHxUi2b5zph5FykxI9xU0SLzNjwM85h12aSLnFyZ09SfCWYUa0J5IWWlsGA5NrOLuFT1 9gKivKIaPnnRFkkoVzJvKEBMP2Cxftn/H4BSnkWo5nRDvR49eJaH+ykTWQx9yKHlvUFt Kko5v16U/1XhxiFl/EbMGKM+sf3l9nRl+qTNIivgYFbKwcs6hF+irdF7KL/US0h2LIaN ANRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=7F5kMVNWPDK3GXVEki7MgTEGk69/u+hsKDKuubMf3w8=; b=eRB8505tuJeTOTHfQSdbdCXvSq6BzSN2aGLx/ZAsOesWYlSsCIb41y4WCvtNoW/YQv IcJSuouDaNOyX3uCLe+MSjIUsAFNj6Br9x6X1y+r3ejnnkppaRb0Y/dU+6p4Ty1yGEcp XAcvMv7oLYz+kVmDVKpwQJ5sgNdqowC+jLELSbf15Syz6JYvN68RLaFhQc6DLB4E0GBN jbFC61hJx9LSg2ol/ThDtx6zH0ymknkuThzNbb+//IoRNie9Vjeq4Kp3icbaFelKtB25 mNkmfMLYa9YZ12ARjR3MXQEKKLEoA6KdqNY8De0/tFo1DEz/iNUfCNEj0SbvOmrSWRQx L0PA== X-Gm-Message-State: AOAM533urRPdYyH0a69T2Nmzm1i7DpWl4ViI8SkPFIkWS+h2MgagAxC9 2X+erbPsKfl4HI86bKoI8zT+KhPXp0z7Ke02iJ4= X-Google-Smtp-Source: ABdhPJyCUu8LJb3omothdZPMDj3ZF3hgDrWvevD7AT8NAer6d+EQOR/YqIrNo2nKh5K5TkERjtb3Q2MTsOm7JgW0EIQ= X-Received: by 2002:a25:1c56:: with SMTP id c83mr24748462ybc.222.1631041824460; Tue, 07 Sep 2021 12:10:24 -0700 (PDT) MIME-Version: 1.0 From: mt bar <mtbar131@HIDDEN> Date: Tue, 7 Sep 2021 12:10:13 -0700 Message-ID: <CAMy5G4iJktVpCQhbs1B9sgi+vfHQ6JTnxeXH=v2yUypBC-3S2w@HIDDEN> Subject: Ediff 2.81.5 of July 4, 2013; Feature Suggestion: Support viewing diff between just remote & base or just local & base To: kifer@HIDDEN, bug-gnu-emacs@HIDDEN Content-Type: multipart/alternative; boundary="0000000000008f93e105cb6c84c2" Received-SPF: pass client-ip=2607:f8b0:4864:20::b36; envelope-from=mtbar131@HIDDEN; helo=mail-yb1-xb36.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: 0.2 (/) --0000000000008f93e105cb6c84c2 Content-Type: text/plain; charset="UTF-8" Hi, I am writing to suggest a new feature to the ediff package that I think can improve the user experience when resolving complicated merges. It would be helpful if ediff supported switching between a 3 way diff (i.e a diff between BASE, LOCAL & MASTER) and a diff with only the BASE (i.e a diff between just the BASE & LOCAL or a diff between just the BASE & REMOTE). While resolving a complicated merge I use `ediff-merge-files-with-ancestor` to see all 3 versions (i.e BASE, LOCAL & REMOTE) of the same file. In this setup ediff shows the diff by comparing all 3 versions of the file.I often find it helpful to first copy all the contents of the LOCAL buffer into the COMBINED buffer and then view diff between REMOTE & BASE one by one and merge them correctly inside the COMBINED buffer manually. (I ask git to not automerge such files by using the `mergetool.hideResolved` flag so that I don't miss any change). However, as far as I know there is no way to ask ediff to only show the diff between the REMOTE BASE instead of the default 3-way diff. It is bit cumbersome to jump over the 3-way diff hunks and manually isolate the diff between REMOTE & BASE from the 3-way diff between LOCAL, REMOTE & BASE. I probably am uninformed about some existing feature that already does this so feel free to point me towards that. If not, I would really like to see this support from ediff. Thank you Amit Emacs : GNU Emacs 26.3 (build 1, x86_64-pc-linux-gnu, GTK+ Version 3.22.30) of 2020-06-16 Package: Ediff 2.81.5 of July 4, 2013 current state: ============== (setq ediff-diff-program "diff" ediff-diff-options "" ediff-diff3-program "diff3" ediff-diff3-options "" ediff-patch-program "patch" ediff-patch-options "-f" ediff-shell "sh" ediff-use-faces t ediff-auto-refine 'on ediff-highlighting-style 'face ediff-buffer-A #<buffer layers_LOCAL_13445.go> ediff-buffer-B #<buffer layers_REMOTE_13445.go> ediff-control-buffer #<buffer *Ediff Control Panel*> ediff-forward-word-function 'ediff-forward-word ediff-control-frame nil ediff-control-frame-parameters '((name . "Ediff") (minibuffer) (user-position . t) (vertical-scroll-bars) (scrollbar-width . 0) (scrollbar-height . 0) (menu-bar-lines . 0) (tool-bar-lines . 0) (left-fringe . 0) (right-fringe . 0) (auto-lower) (auto-raise . t) (visibility) (width . 1) (height . 1) (fullscreen) (top . 67) (left . 270)) ediff-control-frame-position-function 'ediff-make-frame-position ediff-prefer-iconified-control-frame nil ediff-window-setup-function 'ediff-setup-windows-plain ediff-split-window-function 'split-window-horizontally ediff-job-name 'ediff-merge-files-with-ancestor ediff-word-mode nil ediff-buffer-name "*Ediff Control Panel*" ediff-device-type nil ) --0000000000008f93e105cb6c84c2 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div>Hi,</div><div><br></div><div>I am writing to suggest = a new feature to the ediff package that I think can</div><div> improve the = user experience when resolving complicated merges.<br></div><div><br></div>= <div>It would be helpful if ediff supported switching between a 3 way diff<= /div>(i.e a diff between BASE, LOCAL & MASTER) and a diff with only the= BASE (i.e a<br>diff between just the BASE & LOCAL or a diff between ju= st the BASE &<br>REMOTE).<br><br>While resolving a complicated merge I = use<br>`ediff-merge-files-with-ancestor` to see all 3 versions (i.e BASE, L= OCAL<br>& REMOTE) of the same file. In this setup ediff shows the diff = by<br>comparing all 3 versions of the file.I often find it helpful to first= <br>copy all the contents of the LOCAL buffer into the COMBINED buffer and<= br>then view diff between REMOTE & BASE one by one and merge them corre= ctly<br>inside the COMBINED buffer manually. (I ask git to not automerge su= ch<br>files by using the `mergetool.hideResolved` flag so that I don't = miss<br>any change). However, as far as I know there is no way to ask ediff= to<br>only show the diff between the REMOTE BASE instead of<br>the default= 3-way diff. It is bit cumbersome to jump over<br>the 3-way diff hunks and = manually isolate the diff between REMOTE & BASE<br>from the 3-way=C2=A0= diff between LOCAL, REMOTE & BASE.<br><br>I probably am uninformed abou= t some existing feature that already does<br>this so feel free to point me = towards that. If not, I would really like<br><div>to see this support from = ediff.</div><br>Thank you<br>Amit<br><br><br><br>Emacs =C2=A0: GNU Emacs 26= .3 (build 1, x86_64-pc-linux-gnu, GTK+ Version 3.22.30)<br>=C2=A0of 2020-06= -16<br>Package: Ediff 2.81.5 of July 4, 2013<br><br>current state:<br>=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D<br>(setq<br>=C2=A0ediff-diff-progra= m "diff"<br>=C2=A0ediff-diff-options ""<br>=C2=A0ediff-= diff3-program "diff3"<br>=C2=A0ediff-diff3-options ""<b= r>=C2=A0ediff-patch-program "patch"<br>=C2=A0ediff-patch-options = "-f"<br>=C2=A0ediff-shell "sh"<br>=C2=A0ediff-use-faces= t<br>=C2=A0ediff-auto-refine 'on<br>=C2=A0ediff-highlighting-style = 9;face<br>=C2=A0ediff-buffer-A #<buffer layers_LOCAL_13445.go><br>=C2= =A0ediff-buffer-B #<buffer layers_REMOTE_13445.go><br>=C2=A0ediff-con= trol-buffer #<buffer *Ediff Control Panel*><br>=C2=A0ediff-forward-wo= rd-function 'ediff-forward-word<br>=C2=A0ediff-control-frame nil<br>=C2= =A0ediff-control-frame-parameters '((name . "Ediff") (minibuf= fer) (user-position . t) (vertical-scroll-bars) (scrollbar-width . 0)<br> = =C2=A0(scrollbar-height . 0) (menu-bar-lines . 0) (tool-bar-lines . 0) (= left-fringe . 0)<br> =C2=A0(right-fringe . 0) (auto-lower) (auto-raise = . t) (visibility) (width . 1) (height . 1)<br> =C2=A0(fullscreen) (top = . 67) (left . 270))<br>=C2=A0ediff-control-frame-position-function 'edi= ff-make-frame-position<br>=C2=A0ediff-prefer-iconified-control-frame nil<br= >=C2=A0ediff-window-setup-function 'ediff-setup-windows-plain<br>=C2=A0= ediff-split-window-function 'split-window-horizontally<br>=C2=A0ediff-j= ob-name 'ediff-merge-files-with-ancestor<br>=C2=A0ediff-word-mode nil<b= r>=C2=A0ediff-buffer-name "*Ediff Control Panel*"<br>=C2=A0ediff-= device-type nil<br>=C2=A0)<br></div> --0000000000008f93e105cb6c84c2--
mt bar <mtbar131@HIDDEN>:bug-gnu-emacs@HIDDEN.
Full text available.bug-gnu-emacs@HIDDEN:bug#50464; Package emacs.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.