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: Wed, 27 Nov 2013 12:37:58 -0500 Message-ID: References: <87zjowpn2s.fsf@fencepost.gnu.org> <87a9gvnreg.fsf@fencepost.gnu.org> <8761ref7hy.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1385573894 10762 80.91.229.3 (27 Nov 2013 17:38:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 Nov 2013 17:38: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 Wed Nov 27 18:38:18 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 1Vlj45-0001tW-IQ for ged-emacs-devel@m.gmane.org; Wed, 27 Nov 2013 18:38:17 +0100 Original-Received: from localhost ([::1]:37081 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vlj45-0000CJ-1f for ged-emacs-devel@m.gmane.org; Wed, 27 Nov 2013 12:38:17 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vlj3v-0000C1-Up for emacs-devel@gnu.org; Wed, 27 Nov 2013 12:38:15 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vlj3o-0001w3-Hm for emacs-devel@gnu.org; Wed, 27 Nov 2013 12:38:07 -0500 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:40215) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vlj3o-0001vZ-DZ; Wed, 27 Nov 2013 12:38:00 -0500 Original-Received: from faina.iro.umontreal.ca (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id rARHbx6T006544; Wed, 27 Nov 2013 12:37:59 -0500 Original-Received: by faina.iro.umontreal.ca (Postfix, from userid 20848) id CCAC6B4014; Wed, 27 Nov 2013 12:37:58 -0500 (EST) In-Reply-To: <8761ref7hy.fsf@fencepost.gnu.org> (David Kastrup's message of "Wed, 27 Nov 2013 11:45:29 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV4775=0 X-NAI-Spam-Version: 2.3.0.9362 : core <4775> : inlines <267> : streams <1081234> : uri <1607803> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.22 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:165806 Archived-At: > For one thing, smerge-ediff (purportedly as opposed to the smerge-mode > not visibly involved in the user interaction) does not expose _any_ of We can't assume that the user of smerge-ediff does not also use smerge. So it's important to keep a connection between the names used in smerge and the names used in ediff. Maybe in your case it's not helpful, but I think the added text should clarify the problem (and the 5/6 extra chars may occasionally push the extra info past the truncation, but this truncation problem exists even without those extra 5/6 chars). > git pull -r > it labels the upstream changes as "MINE" and my own changes as "OTHER". Of course, any tool is free top put the 2 in whichever order they prefer. Maybe we should revisit the MINE/OTHER names used so far. But whichever name we use there will need to also be present in smerge-ediff. Stefan