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: svn and smerge-mode Date: Tue, 26 Aug 2008 09:46:07 -0400 Message-ID: References: <18611.52098.805757.689913@kahikatea.snap.net.nz> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1219759532 3940 80.91.229.12 (26 Aug 2008 14:05:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 26 Aug 2008 14:05:32 +0000 (UTC) Cc: emacs-devel@gnu.org To: Nick Roberts Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Aug 26 16:06:20 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1KXzBH-0002wJ-QK for ged-emacs-devel@m.gmane.org; Tue, 26 Aug 2008 16:06:00 +0200 Original-Received: from localhost ([127.0.0.1]:41747 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KXzAJ-0004qL-N5 for ged-emacs-devel@m.gmane.org; Tue, 26 Aug 2008 10:04:59 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KXysA-0002t8-7A for emacs-devel@gnu.org; Tue, 26 Aug 2008 09:46:14 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KXys8-0002s2-Ew for emacs-devel@gnu.org; Tue, 26 Aug 2008 09:46:13 -0400 Original-Received: from [199.232.76.173] (port=46139 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KXys8-0002rw-4w for emacs-devel@gnu.org; Tue, 26 Aug 2008 09:46:12 -0400 Original-Received: from ironport2-out.pppoe.ca ([206.248.154.182]:6934 helo=ironport2-out.teksavvy.com) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KXys8-0004jR-2V for emacs-devel@gnu.org; Tue, 26 Aug 2008 09:46:12 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApsEAICls0jO+IDK/2dsb2JhbACBZbZjgWuBCg X-IronPort-AV: E=Sophos;i="4.32,270,1217822400"; d="scan'208";a="25954185" Original-Received: from 206-248-128-202.dsl.teksavvy.com (HELO ceviche.home) ([206.248.128.202]) by ironport2-out.teksavvy.com with ESMTP; 26 Aug 2008 09:46:09 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 68B54B479B; Tue, 26 Aug 2008 09:46:07 -0400 (EDT) In-Reply-To: <18611.52098.805757.689913@kahikatea.snap.net.nz> (Nick Roberts's message of "Tue, 26 Aug 2008 21:23:14 +1200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:102985 Archived-At: > With Emacs 23.0.60, visiting a file with conflicts under SVN control > puts it into smerge-mode. I think this is too prescriptive. On the > few occasions that I need to resolve conflicts I do it by hand and > I've lost information trying to use smerge-mode. If someone wants > smerge-mode they can easily turn it on. The intention of smerge-mode is to be "out of the way" as much as possible. Now admittedly, it's not perfectly so, but rather than leave it off by default or provide a config var for it, I'd rather fix the problem you encountered. Basically, the only effect of turning on smerge-mode should be to highlight the conflicts with font-lock (as long as you don't use the C-x ^ prefix, obviously). So which part of smerge-mode annoys you? And more importantly, which part caused you to lose information? Stefan