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: Fri, 7 Apr 2017 20:23:41 +0100 Message-ID: References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: blaine.gmane.org 1491593091 4268 195.159.176.226 (7 Apr 2017 19:24:51 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 7 Apr 2017 19:24:51 +0000 (UTC) Cc: Glenn Morris , Kaushal Modi , Emacs developers To: Noam Postavsky Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 07 21:24:45 2017 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 1cwZUw-00008T-1x for ged-emacs-devel@m.gmane.org; Fri, 07 Apr 2017 21:24:42 +0200 Original-Received: from localhost ([::1]:52308 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwZV1-0004oJ-P3 for ged-emacs-devel@m.gmane.org; Fri, 07 Apr 2017 15:24:47 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58409) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwZUU-0004o1-NA for emacs-devel@gnu.org; Fri, 07 Apr 2017 15:24:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cwZUT-000631-TZ for emacs-devel@gnu.org; Fri, 07 Apr 2017 15:24:14 -0400 Original-Received: from mail-vk0-x230.google.com ([2607:f8b0:400c:c05::230]:36694) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cwZUS-00062k-CM; Fri, 07 Apr 2017 15:24:12 -0400 Original-Received: by mail-vk0-x230.google.com with SMTP id s68so85411230vke.3; Fri, 07 Apr 2017 12:24: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=7lXPsDEkyreqmNDLQtxPw3eezA/hH1ddlhBdOonoAxE=; b=Df1Z4x7DsKsPNrxrPKTVf+W+XgY8XQ/c628Kh8cNW7DZukCXvEWBXOHPcj9tog7eA1 D1x07e9UbqWNo9TTtd41FwWBl8AljmffhNCHoslL5AQUxDJzfVXMCaJ9jiHlB+nL7umn kXMkv5o58qBwJOFB3U0K+nDlbkqCONgbqAV4sG8R5heacQIQ7f5paKd3s9zuWb/VY9yS 9I6Yl+HwIACeDXE8jbPbkWLRiHpXXk1XG8UGPw5WAGQIIJLxonUopDNyOaAWk+xD7sCW SFXUDhLeNGLti6oXvE+Ev77wATnLocsuYV9iRpnwAcQF6726WbKpS8jr90h9h2x34XDo JSkA== 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=7lXPsDEkyreqmNDLQtxPw3eezA/hH1ddlhBdOonoAxE=; b=cr7B3QDsaLKfWMVsZHP+XJq38RGQeptMhIVcc6vuq+blZjNm5479qvlNT2ygcAZd7t tb7TBHPhypxumbOpewXPAP8P1g/z4xeaqL+N6CLK5GGtOjR5T4XMjPh7WqK+Z3+Gtret ZKuj9cSU0nqM2gGCJZVs6+hDJtlL3wdGkiPMspi/fjTnbevGQYNekJlg8oxrprr8enPA GkcNbSwnM3a7LShm1aA+1AVRbPTF2rt6UNPE+Vm53BpGyN3spoPTgkcyGuj5wmtXOzQW +GtLTEW1iSFfHAJo4DBWwaDcFnOsir05KF5CzPWY7P1MWyudmxEl0qeemaG1yWwVT0G3 YOgA== X-Gm-Message-State: AFeK/H1ohKuDDcteunNjEM6UpJoVf520MikbYceiAKuN9s4yrgf9m9D8AmVnRvjkMlM6zIs2Uoo3IavaybTitA== X-Received: by 10.31.153.74 with SMTP id b71mr19853047vke.73.1491593051589; Fri, 07 Apr 2017 12:24:11 -0700 (PDT) Original-Received: by 10.176.71.131 with HTTP; Fri, 7 Apr 2017 12:23:41 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400c:c05::230 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:213776 Archived-At: On 7 April 2017 at 20:09, Noam Postavsky wrote: > On Fri, Apr 7, 2017 at 2:06 PM, Richard Copley wrote: > >>>> http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=bdfee01a6567b9f08f82bc84d1196e6cb62587ca >> >> I've had plenty of time to think about this and I still don't get >> it. Why are we calling the left window UPPER and the right window >> LOWER? In the lower pane (the conflicted file for resolution) >> they are called "variant A" and "variant B". Shouldn't we call >> them that too, so that we know which one is which? >> > > You seem to be talking about ediff or emerge, but this thread is about > smerge which operates in a single buffer, no windows involved. Thanks, I knew I must have been missing something. IMO making smerge weird is a disadvantage of this change.