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 20:10:42 +0000 Message-ID: References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="f4f5e80c3ecce18aa405677917a3" X-Trace: blaine.gmane.org 1521144562 6663 195.159.176.226 (15 Mar 2018 20:09:22 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 15 Mar 2018 20:09:22 +0000 (UTC) Cc: Noam Postavsky , "emacs-devel@gnu.org" , Stephan.Mueller@microsoft.com, Stefan Monnier , Kaushal Modi To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 15 21:09:17 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 1ewZBd-0001dK-Db for ged-emacs-devel@m.gmane.org; Thu, 15 Mar 2018 21:09:17 +0100 Original-Received: from localhost ([::1]:53193 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewZDg-0006dd-IV for ged-emacs-devel@m.gmane.org; Thu, 15 Mar 2018 16:11:24 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38443) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewZDZ-0006dG-LR for emacs-devel@gnu.org; Thu, 15 Mar 2018 16:11:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ewZDY-0001hS-L7 for emacs-devel@gnu.org; Thu, 15 Mar 2018 16:11:17 -0400 Original-Received: from mail-ot0-x233.google.com ([2607:f8b0:4003:c0f::233]:42387) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ewZDW-0001gY-AM; Thu, 15 Mar 2018 16:11:14 -0400 Original-Received: by mail-ot0-x233.google.com with SMTP id l5-v6so8165877otf.9; Thu, 15 Mar 2018 13:11:14 -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=ra/HpsSBVsR5wK+693qtvGIupzpglnABLv+nf7Ikmc8=; b=kUdqJHdlUli9MG9sdCBHU/a2csG48GbTUECuPiqyPbpExHGKn+ik29p1q29q3il34x QKgkhbDyw9vsiQdAg2rbpNXr4X13ZftmEm7o+5Gw80T3kdfFmsZ7XmvBSTSplRDi5acV IIXCi9aR/NAQPdK8MxDRMjuyqFfIYQurB1EHU9bOyrhSJxYTRnaXMIeTZ3Ov2AUWWQaw 57QY/nc8OdwKIzm/llb5/wna5HwbHph0J9pHNZy4d+/WYnpWK0otILVi2yST79mDRIaf gFmU71nFhH54cMrFLsbUl5MVHKPF9DhL/FmQlFnNXy9n2JzNcSdG6VZ9viYEbVnCuix4 i4uw== 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=ra/HpsSBVsR5wK+693qtvGIupzpglnABLv+nf7Ikmc8=; b=AjdXhmRCQLQ+eNzjuSCPUUvjR85a0bSTI6rc+RuSWfA0XOsXCHTQM5yrBdlIkF0xI8 ribkfd5ouh9eUx4OMvUZ789KrjACUrCYsPFBO1LnxVHv45ZnSPMP8zZ7m1LL8jUL/hop ShSGmw3IR62QUUCe2WTUEw4xZof9RzL/Xs/r2LaPVGk5iGrPsDomnIugCl3bONDz+lHX epavEueXdevfoJKjJnxALUpA7ZiwtONzJaCEKvETEn81rWtyY8HWJ+7OIxtmG0jIJpwQ SZbYpPtBxsj06wSV4pGOBCkfICbandxamfpyBHpHDOThb7DVTUcvgOf2KFWFndhbPGzh OEbg== X-Gm-Message-State: AElRT7FspMf2TSF+RomBR3AX+5j8qsV2paxgs2AmyHCIZMkvJ1ASJnru UJ+jmGGBJ3LjdcG8MKN6hcAFF05qGz+45/cOBanMBA== X-Google-Smtp-Source: AG47ELvK9FY9eqi27mwMTcgUrbhgE8I0CVTK0g76HmaxF4VdYAP3cZy7luCuv7V5N0ow87/q6QCBhyKJKRVm26USVOs= X-Received: by 10.157.115.147 with SMTP id j19mr6119893otk.302.1521144672912; Thu, 15 Mar 2018 13:11:12 -0700 (PDT) Original-Received: by 2002:a9d:44ce:0:0:0:0:0 with HTTP; Thu, 15 Mar 2018 13:10:42 -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::233 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:223766 Archived-At: --f4f5e80c3ecce18aa405677917a3 Content-Type: text/plain; charset="UTF-8" On 15 March 2018 at 17:14, Richard Copley wrote: > > > On 15 March 2018 at 16:45, Glenn Morris wrote: > >> Richard Copley wrote: >> >> > Why is this change good? What am I missing? >> >> https://debbugs.gnu.org/20878 >> >> > Thanks. If we were using labels such as "Yours/Theirs" previously, I can > see > why "Upper/Lower" are better. > > >> It would have helped to cite the last time you raised this issue, where >> a patch for your usage was suggested. >> >> http://lists.gnu.org/archive/html/emacs-devel/2017-04/msg00349.html > > > Yes, sorry about that. My message today was meant to be a reply to that > very thread. Not sure what went wrong. > And sorry I missed Noam's question. > I will try the patch. > With that patch, smerge-ediff creates buffers with "A" and "B" in their names rather than "UPPER" and "LOWER", which is what I want. I still don't know how to use smerge itself, so I don't know what if anything is displayed differently in smerge with the patch. Thanks Noam, thanks Glenn. --f4f5e80c3ecce18aa405677917a3 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On 1= 5 March 2018 at 17:14, Richard Copley <rcopley@gmail.com> wr= ote:


On 15 March 201= 8 at 16:45, Glenn Morris <rgm@gnu.org> wrote:
Richard Copley wrote:

> Why is this change good? What am I missing?

https://debbugs.gnu.org/20878


Thanks. If we were using labels= such as "Yours/Theirs" previously, I can see
why &= quot;Upper/Lower" are better.
=C2=A0
It would have helped to cite the last time you raised this issue, where
a patch for your usage was suggested.

http://lists.gnu.org/archive/html/emacs-devel/2017-04/msg00349.html

Yes, sorry about that. My message today was meant to be a repl= y to that very thread. Not sure what went wrong.
And sorry I= missed Noam's question.
I will try= the patch.

With that patch= , smerge-ediff creates buffers with "A" and "B" in thei= r names rather than "UPPER" and "LOWER", which is what = I want.
I still don't know how to use smerge itself, so I don't = know what if anything is displayed differently in smerge with the patch.
Thanks Noam, thanks Glenn.
=C2=A0
--f4f5e80c3ecce18aa405677917a3--