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 15:37:06 +0000 Message-ID: References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="f4f5e80d08c8730be005677545b1" X-Trace: blaine.gmane.org 1521128304 28991 195.159.176.226 (15 Mar 2018 15:38:24 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 15 Mar 2018 15:38:24 +0000 (UTC) Cc: Glenn Morris , Noam Postavsky , Stephan.Mueller@microsoft.com, Stefan Monnier , "emacs-devel@gnu.org" To: Kaushal Modi Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 15 16:38:20 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 1ewUxK-0007Mi-Ln for ged-emacs-devel@m.gmane.org; Thu, 15 Mar 2018 16:38:14 +0100 Original-Received: from localhost ([::1]:52199 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewUzN-0007cS-M4 for ged-emacs-devel@m.gmane.org; Thu, 15 Mar 2018 11:40:21 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56347) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewUwn-0005vR-It for emacs-devel@gnu.org; Thu, 15 Mar 2018 11:37:47 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ewUwm-0000Ye-Jv for emacs-devel@gnu.org; Thu, 15 Mar 2018 11:37:41 -0400 Original-Received: from mail-ot0-x22c.google.com ([2607:f8b0:4003:c0f::22c]:38007) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ewUwk-0000XM-JN; Thu, 15 Mar 2018 11:37:38 -0400 Original-Received: by mail-ot0-x22c.google.com with SMTP id 95-v6so7291177ote.5; Thu, 15 Mar 2018 08:37:38 -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=QN+QoLaHnetNcupGye06hq96iwO7MQKtYD39aatTCH0=; b=tVl5p1EHAZNElCVxjuw+C92GU8rGrMD9Yyf0/t7PrgpwHugmnXKR0OUB5Az6uKVtNk pYXiHkahsqvbrmgJKaEHiFBsIJikSmz3ZjHPW1dmp9wbs77y/0zL8S0FVVK0yGC3FCSj IqzFKMILYRQ8yJPSnfrWA9TefTJ+om1sXwWrPd8A6Bi8YYKohlpVAfuk5vQlMs+VGZfy zm8TxaPzMgqAPevZXKaAUyunYOkHoGACYEkjIDmnGeH+fOLZ2ve+FJIaHmWm8YEgPEq6 lhmIs2l+XC35I3OEbhxCd5VgQVjidfPwzIHI/tkIBZXwcLw9T5LxnBgifryugySkN1r1 1DQg== 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=QN+QoLaHnetNcupGye06hq96iwO7MQKtYD39aatTCH0=; b=oboYqqL+sKd7MEwrFwAklmzbFsioVlz/PqmaDyHLkuyS+i9PqSof2FEW6/FAbnYHt7 8waqs1duOD+iDnL7C0AYJUaRmC5rVXWA8gN+t4MTcUv7RLcAtZe2YmrDqFmW6zNUh1cL 1/B0etxN1m3mCKsw1fdI7nyo5/R10U2ECMnwTa4xykqrFQo7G7qg8SewY5nMnrJAB0hj uLZHKu+4CX0PWTY9jFEv3I35R09y2wz+zgLpTD299J8MgzJx141OOecckg9qLpOJvq55 RKiLZu+T1b9CH7h3cRRMpJBjM8HC1tpVZnLjQWYqKXPpDRLPBJXmvJ1ltA1HYK5Qxdtt 7FGQ== X-Gm-Message-State: AElRT7EtIKgw1oxRunpDPDQuA3RWbq6kC8l9OX4ZB3jykLzsY7DUMlBM y9L+5frl7Rup8xziBcYvdBJi6SQ38nsC+VkOb/4= X-Google-Smtp-Source: AG47ELtCRiNKVSHdzK5SOTmlLgQtbsl05CrpVi5ouxv5gDeyK/5wmzeWY3xAe9jiQ3UhLm6wWIqQ8tCGuLIBf0ExfaM= X-Received: by 10.157.115.210 with SMTP id m18mr5630638otk.188.1521128257553; Thu, 15 Mar 2018 08:37:37 -0700 (PDT) Original-Received: by 2002:a9d:44ce:0:0:0:0:0 with HTTP; Thu, 15 Mar 2018 08:37:06 -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:c0f::22c 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:223746 Archived-At: --f4f5e80d08c8730be005677545b1 Content-Type: text/plain; charset="UTF-8" On 15 March 2018 at 15:30, Kaushal Modi wrote: > On Thu, Mar 15, 2018 at 10:38 AM Richard Copley wrote: > >> "A" and "B" are the names diff3 uses for the conflict markers. >> > > I would find that very confusing in Smerge. > > >> "A" and "B" are the names used in the documentation. >> > > Which documentation? If Smerge documentation, then it should be fixed to > update to the convention of upper/lower? > Yes, the smerge documentation, and no, because UPPER and LOWER are wrong, in some use cases. > > >> "UPPER" and "LOWER" are useless since they don't match up with anything >> else (the conflict markers and the documentation). >> > > I have never found that convention confusing.. We are strictly speaking of > the use of upper/lower in Smerge. > I'm not sure what you mean. We're talking about the same change. Perhaps its effects are wider than you think. > "UPPER" and "LOWER" are confusing since they are often shown on the left >> and right respectively. >> > > Hmm, the conflicts don't show up left/right for me.. How are you using > Smerge? > Please see my reply to Stefan. How are you using it? > > >> Why is this change good? What am I missing? >> > > Well, it worked great for me. FYI, I am just an Smerge user (not > contributor), and this was a welcome change for my use case.. never done > conflict merging using Smerge using left/right orientation as you suggest. > -- > > Kaushal Modi > --f4f5e80d08c8730be005677545b1 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On 15 March 2018 at 15:30, Kaushal Modi <kaushal.modi@gmail.com= > wrote:
<= div class=3D"gmail_quote">
On Thu, Mar 15,= 2018 at 10:38 AM Richard Copley <rcopley@gmail.com> wrote:
"A&quo= t; and "B" are the names diff3 uses for the conflict markers.
=

I would find that= very confusing in Smerge.
=C2=A0
"A= " and "B" are the names used in the documentation.
=

Which documentation? If= Smerge documentation, then it should be fixed to update to the convention = of upper/lower?

Yes, = the smerge documentation, and no, because UPPER and LOWER are wrong, in som= e use cases.
=C2=A0
=C2= =A0
"UPPER" and "= LOWER" are useless since they don't match up with anything else (t= he conflict markers and the documentation).

I have never found that convention confusing.= . We are strictly speaking of the use of upper/lower in Smerge.

I'm not sure what you mean. = We're talking about the same change. Perhaps its effects are wider than= you think.
=C2=A0
&quo= t;UPPER" and "LOWER" are confusing since they are often show= n on the left and right respectively.

Hmm, the conflicts don't show up left/right for= me.. How are you using Smerge?

=
Please see my reply to Stefan.
How are you using it?
=C2=A0
=C2=A0
<= /div>
Why is this change good? What am I missing?

Well, it worked great for me. FYI, I am j= ust an Smerge user (not contributor), and this was a welcome change for my = use case.. never done conflict merging using Smerge using left/right orient= ation as you suggest.
--

Kaushal Modi<= /p>


--f4f5e80d08c8730be005677545b1--