From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Richard Copley Newsgroups: gmane.emacs.devel Subject: Re: Regarding smerge upper/lower; needs NEWS Date: Thu, 15 Mar 2018 16:09:03 +0000 Message-ID: References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="001a113dc584cfe200056775b771" X-Trace: blaine.gmane.org 1521130173 2522 195.159.176.226 (15 Mar 2018 16:09:33 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 15 Mar 2018 16:09:33 +0000 (UTC) Cc: Glenn Morris , "emacs-devel@gnu.org" , Stephan.Mueller@microsoft.com, Noam Postavsky , Kaushal Modi To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 15 17:09:29 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ewVRT-0000Qp-NE for ged-emacs-devel@m.gmane.org; Thu, 15 Mar 2018 17:09:23 +0100 Original-Received: from localhost ([::1]:52417 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewVTW-0002G1-Nf for ged-emacs-devel@m.gmane.org; Thu, 15 Mar 2018 12:11:30 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37135) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewVRj-0001b4-Li for emacs-devel@gnu.org; Thu, 15 Mar 2018 12:09:43 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ewVRi-0001HR-JO for emacs-devel@gnu.org; Thu, 15 Mar 2018 12:09:39 -0400 Original-Received: from mail-oi0-x236.google.com ([2607:f8b0:4003:c06::236]:37226) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ewVRh-0001Fk-4y; Thu, 15 Mar 2018 12:09:37 -0400 Original-Received: by mail-oi0-x236.google.com with SMTP id f186so6139315oig.4; Thu, 15 Mar 2018 09:09:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=2n0L1ciOqQtjY1x/fMqIHgcAaBQh41Z8kt7xCnIklvo=; b=jfwHJ1x5M1Ajfx6JFokP+17viYSkO5DKEnxz151aE2wzRa3dAiGfzhkEemBbewuG86 8DrkrJ6cZtTEzEqFRLPmS0EAyjAtqv6/LWfR8vn4iYlmABrt+peQCUSnUu0+cEX0BJT0 9bcc90U8RG0DN47mz7LNgaQKN6gCF8CkNZ+R8w7kevZUT54mcDKEXjQXxFV9cApl49NV sHE0iYUEUKmw9cl+YnAH12KMaO4fqpvzBPYPSzM1OCXX0sL0AcPHfJPplGRpsWgpvtes AGgvfjvT/zgLBpxCSNcg4vvFLxeiN3cC4scql5wzDXBBQkspXFQ88RRTVPDuI0HgGPFL E8PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=2n0L1ciOqQtjY1x/fMqIHgcAaBQh41Z8kt7xCnIklvo=; b=XvlvyoZZxIw1X81EiRI+gODxna5xon+QRn29pf2IRcde3x7uWCoGKC/B5k0Pkf0xU7 yg00rzEEXmw8w9XhaOf35zKvGnQN9B+YlVB1soEzm2V6Ll247TSd657OAdPbmJryfF+y lUIEwyRKUy1SBh7wTZ/Pk+OL4Gr01mdBO4KXPD6mWTXvoXtVgmrXY+XijWL6rtrgALaF nM2nwKV/p7YUtO2Uw9v0s34LNAuVFXtS4upGzZKefgNje3/FnH2l5T7hmGw/Xq1H4CMi 0D5HTi/mC3U8ttxPCU+AjaZPwKMqw316KlrcJOpqMcYfzOVhRfG3+gpAXZuasAjETF2P g8fA== X-Gm-Message-State: AElRT7HlxKc9KxY32NO1n4dfIfSucwBa5p6ShLs6zTRAASUanVXQ4bZW B0mVYDZSdDJ0PgFXewMoR6mrNU1GItwAKopSAJw= X-Google-Smtp-Source: AG47ELtM8bIA9wyXc1ekUN4tMBnhxr3b59F4WsaFEdVuaZYB2Tyon+nAaX0UVCh+ujH7InTbyh0kotXRdZjm7Lgawj0= X-Received: by 10.202.193.214 with SMTP id r205mr5811342oif.139.1521130176240; Thu, 15 Mar 2018 09:09:36 -0700 (PDT) Original-Received: by 2002:a9d:44ce:0:0:0:0:0 with HTTP; Thu, 15 Mar 2018 09:09:03 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c06::236 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:223749 Archived-At: --001a113dc584cfe200056775b771 Content-Type: text/plain; charset="UTF-8" On 15 March 2018 at 15:43, Stefan Monnier wrote: > > In "smerge-ediff", I think. > > smerge-ediff is a command which basically *leaves* SMerge (the whole > purpose of SMerge is to do the conflict resolution directly in the one > buffer rather than going through Ediff, which is a fine tool but too > heavyweight for my taste in 99% of the cases (tho I really appreciate it > for that remaining 1%)). > > Also the upper/lower (or any other nomenclature SMerge uses) only > affects the name of the generated buffers: Ediff labels will simply > always be A/B with corresponding key-bindings and the upper/lower > terminology of SMerge just disappears. > > So I guess what you're saying is that we should improve the consistency > in the naming used by SMerge and Ediff. That's a good point. > And indeed upper/lower doesn't work for Ediff. > > > Stefan > Thanks Stefan and Kaushal. I'll revert the change locally for now. I don't use Smerge itself (perhaps I should learn), so I suppose it's natural that I don't understand why UPPER and LOWER are such good labels that it's important to keep them. --001a113dc584cfe200056775b771 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On 1= 5 March 2018 at 15:43, Stefan Monnier <monnier@iro.umontreal.ca= > wrote:
> = In "smerge-ediff", I think.

smerge-ediff is a command which basically *leaves* SMerge (the whole=
purpose of SMerge is to do the conflict resolution directly in the one
buffer rather than going through Ediff, which is a fine tool but too
heavyweight for my taste in 99% of the cases (tho I really appreciate it for that remaining 1%)).

Also the upper/lower (or any other nomenclature SMerge uses) only
affects the name of the generated buffers: Ediff labels will simply
always be A/B with corresponding key-bindings and the upper/lower
terminology of SMerge just disappears.

So I guess what you're saying is that we should improve the consistency=
in the naming used by SMerge and Ediff.=C2=A0 That's a good point.
And indeed upper/lower doesn't work for Ediff.


=C2=A0 =C2=A0 =C2=A0 =C2=A0 Stefan

Thank= s Stefan and Kaushal.
I'll revert t= he change locally for now.
I don't = use Smerge itself (perhaps I should learn), so I suppose it's natural t= hat I don't understand why UPPER and LOWER are such good labels that it= 's important to keep them.

--001a113dc584cfe200056775b771--