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:30:40 +0000 Message-ID: References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="f4f5e80c3ecc6baa390567752ebf" X-Trace: blaine.gmane.org 1521127826 27219 195.159.176.226 (15 Mar 2018 15:30:26 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 15 Mar 2018 15:30:26 +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 16:30:21 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 1ewUpd-0006sL-FY for ged-emacs-devel@m.gmane.org; Thu, 15 Mar 2018 16:30:18 +0100 Original-Received: from localhost ([::1]:52150 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewUre-0003Sv-J6 for ged-emacs-devel@m.gmane.org; Thu, 15 Mar 2018 11:32:22 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54276) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewUqd-00033K-Ly for emacs-devel@gnu.org; Thu, 15 Mar 2018 11:31:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ewUqc-0004ol-NU for emacs-devel@gnu.org; Thu, 15 Mar 2018 11:31:19 -0400 Original-Received: from mail-ot0-x229.google.com ([2607:f8b0:4003:c0f::229]:33073) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ewUqW-0004gW-4o; Thu, 15 Mar 2018 11:31:12 -0400 Original-Received: by mail-ot0-x229.google.com with SMTP id y11-v6so7278714otg.0; Thu, 15 Mar 2018 08:31:12 -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=LRgM+WTi8F1b3mwfYK2zAUpvVl5TOflTvUry+q9nRJE=; b=A0/vVfJtKBxVI6vdd7NJNOPexhuwh6zhACHWRxperuvMTV273lARa3Hr//c1aM9c7+ DcML0YP6WKbibXRZP/ozvM/hdXhzfQMTmv+PSXFMjVPLt6Qx6GasX6OJ82psSXuCSPS9 xnY2PuYoyY5zbzWjxrC1CAUn54QX2QEXdVLczL31ewv9yWIA6hv/3hfpj084Ja2n4AvY XQDmeaQaGT9z2I8qf0wx8X+lfHsdxhfBatrp48MQagEnBzOhiKblOKuwHHbdoCd7kyIe bcLyPESEuiXu2fMcAyWBOt8HFg9cChfNGnW++Qfd7qH7kLjzUxVJ5mXoEq6WjxxIIy/Y 40Sw== 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=LRgM+WTi8F1b3mwfYK2zAUpvVl5TOflTvUry+q9nRJE=; b=f5oTVxYWBcLCoFaBOCpHuyHyLstbGE4p45pwFX6iWhECZvrCWK63Pqnu4dgtdfYPge 33jxPeecin7rJHJIg8tmlROgpXS2TowVZsXIwYZBa+NALx6NOzf0Gs21hONk+YJVI75V qhHLbmBwQpH3unZ+W7E0lzpYgWAJpFwAJOb9MDSx84tu2+34pAkGarejo2RgMwGF6yoV DcrZgXZRgnCt5pnb5l6CbjI7TQn0055Y+E13ln12ZhxyPtY+GiQqTx+bt7fB2LSMl18K OWFL8X0piQIecLHmu3t8ggIuOgUcKbTt+YPqvZJvlR6aOyXm8nMutACV12n8wYvy/Cjn 3Bzw== X-Gm-Message-State: AElRT7GPXlLuZcictux8ygBkKlEF5DxsWn63rzEft3us9w9FSrpxVuBG 9QI3FqoWwgVvMqUY94USv56BDTMVhz1M8OXLb4E= X-Google-Smtp-Source: AG47ELsW5naWoG3GgnJLVMhqBrbt4RDQZlG0nej8bH+X9+OLBhSqXzwVeds3CK3LdS/W+81Oo4253UHGQ3XkKA7F1Z0= X-Received: by 10.157.115.147 with SMTP id j19mr5534357otk.302.1521127871190; Thu, 15 Mar 2018 08:31:11 -0700 (PDT) Original-Received: by 2002:a9d:44ce:0:0:0:0:0 with HTTP; Thu, 15 Mar 2018 08:30:40 -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::229 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:223745 Archived-At: --f4f5e80c3ecc6baa390567752ebf Content-Type: text/plain; charset="UTF-8" On 15 March 2018 at 15:04, Stefan Monnier wrote: > > "A" and "B" are the names diff3 uses for the conflict markers. > > "A" and "B" are the names used in the documentation. > > "UPPER" and "LOWER" are useless since they don't match up with anything > > else (the conflict markers and the documentation). > > They match up with the location of the corresponding chunk of text, tho. > > > "UPPER" and "LOWER" are confusing since they are often shown on the left > > and right respectively. > > In SMerge? In which circumstance would it be the case? > > > Stefan > In "smerge-ediff", I think. Suppose git checkout xxx git merge master leaves merge conflicts. Visit a conflicted file and type C-c ^ E. If merge.conflictstyle=diff3 I get (for example): top-left: "*main.cpp UPPER=HEAD*" top-right: "*main.cpp LOWER=master*" bottom-left: "*ediff-merge*" bottom-right: "*main.cpp BASE=merged common ancestors*" Or with git's default (no merge.conflictstyle configured): top-left: "*main.cpp UPPER=HEAD*" top-right: "*main.cpp LOWER=master*" bottom: "*ediff-merge*" And in the "*ediff-merge*" buffer, the conflict markers are "<<<<<<< variant A" and ">>>>>>> variant B". --f4f5e80c3ecc6baa390567752ebf Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

= On 15 March 2018 at 15:04, Stefan Monnier <monnier@iro.umontreal.ca= > wrote:
> "A" and "B" are the names = diff3 uses for the conflict markers.
> "A" and "B" are the names used in the documentatio= n.
> "UPPER" and "LOWER" are useless since they don'= ;t match up with anything
> else (the conflict markers and the documentation).

They match up with the location of the corresponding chunk of text, = tho.

> "UPPER" and "LOWER" are confusing since they are o= ften shown on the left
> and right respectively.

In SMerge? In which circumstance would it be the case?


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

In &q= uot;smerge-ediff", I think.

Su= ppose
=C2=A0 git checkout xxx
=
=C2=A0 git merge master
leaves merge conflicts.
Vis= it a conflicted file and type C-c ^ E.

If merge.conflictstyle=3Ddiff3 I get (for example):

top-left: "*main.cpp UPPER=3DHEAD*"
top-right: "*main.cpp LOWER=3Dmaster*"= ;
bottom-left: "*ediff-merge*"= ;
bottom-right: "*main.cpp BASE=3D= merged common ancestors*"

Or w= ith git's default (no merge.conflictstyle configured):

top-left: "*main.cpp UPPER=3DHEAD*"
top-right: "*main.cpp LOWER=3Dmaster= *"
bottom: "*ediff-merge*&quo= t;

And in the "*ediff-merge*" b= uffer, the conflict markers are "<<<<<<< variant = A" and ">>>>>>> variant B".

--f4f5e80c3ecc6baa390567752ebf--