From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful Date: Fri, 22 Nov 2013 20:42:41 -0500 Message-ID: References: <87zjowpn2s.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1385170994 5087 80.91.229.3 (23 Nov 2013 01:43:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 23 Nov 2013 01:43:14 +0000 (UTC) Cc: emacs-devel@gnu.org To: David Kastrup Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 23 02:43:19 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 1Vk2Fh-0008NP-7o for ged-emacs-devel@m.gmane.org; Sat, 23 Nov 2013 02:43:17 +0100 Original-Received: from localhost ([::1]:41858 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vk2Fg-000078-PJ for ged-emacs-devel@m.gmane.org; Fri, 22 Nov 2013 20:43:16 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54993) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vk2FX-000070-Gd for emacs-devel@gnu.org; Fri, 22 Nov 2013 20:43:14 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vk2FQ-0004sp-7F for emacs-devel@gnu.org; Fri, 22 Nov 2013 20:43:07 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:30839) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vk2FA-0004oY-QP; Fri, 22 Nov 2013 20:42:44 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av4EABK/CFHO+KWN/2dsb2JhbABEvw4Xc4IfAQVWIxALDiYSFBgNJIgkwS2RCgOIYZwZgV6DFQ X-IPAS-Result: Av4EABK/CFHO+KWN/2dsb2JhbABEvw4Xc4IfAQVWIxALDiYSFBgNJIgkwS2RCgOIYZwZgV6DFQ X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="40199799" Original-Received: from 206-248-165-141.dsl.teksavvy.com (HELO pastel.home) ([206.248.165.141]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 22 Nov 2013 20:42:43 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id CDE0760691; Fri, 22 Nov 2013 20:42:41 -0500 (EST) In-Reply-To: <87zjowpn2s.fsf@fencepost.gnu.org> (David Kastrup's message of "Fri, 22 Nov 2013 14:45:15 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 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:165588 Archived-At: Sounds OK (i.e. patch welcome). Just be careful that diff3 markers don't always come with useful "names". Also mine/other is used as mnemonic for key-bindings, so the terminology is "deeply" embedded in smerge-mode, so maybe we should use "MINE - HEAD" and "OTHER - 2c633c8... Issue 3656/2: disambiguate our own ::to_string from std::to_string" for the names. In any case, please make it a bug-report, so we have a number to track it. Stefan