From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful Date: Wed, 27 Nov 2013 21:54:02 +0100 Message-ID: <87mwkpd0r9.fsf@fencepost.gnu.org> References: <87zjowpn2s.fsf@fencepost.gnu.org> <87a9gvnreg.fsf@fencepost.gnu.org> <8761ref7hy.fsf@fencepost.gnu.org> <87r4a1d6pt.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1385629294 6836 80.91.229.3 (28 Nov 2013 09:01:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 Nov 2013 09:01:34 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 28 10:01:39 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VlxTf-0005xA-0T for ged-emacs-devel@m.gmane.org; Thu, 28 Nov 2013 10:01:39 +0100 Original-Received: from localhost ([::1]:39898 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlxTe-0007Yh-KS for ged-emacs-devel@m.gmane.org; Thu, 28 Nov 2013 04:01:38 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44857) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlxTX-0007YI-NH for emacs-devel@gnu.org; Thu, 28 Nov 2013 04:01:36 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VlxTU-0008Sw-HL for emacs-devel@gnu.org; Thu, 28 Nov 2013 04:01:31 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:59762) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlxTU-0008Sq-Eh for emacs-devel@gnu.org; Thu, 28 Nov 2013 04:01:28 -0500 Original-Received: from localhost ([127.0.0.1]:38705 helo=lola) by fencepost.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlxTT-0001o4-T0; Thu, 28 Nov 2013 04:01:28 -0500 Original-Received: by lola (Postfix, from userid 1000) id F2187E0498; Wed, 27 Nov 2013 21:54:02 +0100 (CET) In-Reply-To: (Stefan Monnier's message of "Wed, 27 Nov 2013 15:46:59 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:165832 Archived-At: Stefan Monnier writes: >> Whenever you use _meaning_-carrying names, they'll be wrong half of the >> time. Ediff got that right with A, B, and, uh, C? No idea (rarely use >> three-way conflicts). It's arbitrary what the first and the second >> _mean_, so you just put them first and second on screen and give them A >> and B as monikers. > > For three-way merges, the 3rd is called "BASE" in smerge, which makes > sense, no matter how you get that result. Using A/B/Base is not great > because of the conflicting first letter of B and Base. > Maybe we could go with X/Y/Base? Well, I don't see why "BASE" needs to have a meaning-carrying name while the others don't, but it could be "C" for "Common ancestor". Or "R" for "Root". But the latter is probably a really bad idea in connection with ediff bindings. -- David Kastrup