From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Nick Roberts Newsgroups: gmane.emacs.devel Subject: Re: svn and smerge-mode Date: Wed, 27 Aug 2008 20:47:55 +1200 Message-ID: <18613.5307.347010.863277@kahikatea.snap.net.nz> 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 Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1219826912 21697 80.91.229.12 (27 Aug 2008 08:48:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 Aug 2008 08:48:32 +0000 (UTC) Cc: emacs-devel@gnu.org To: Miles Bader Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Aug 27 10:49:25 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 1KYGiL-0005Pi-Bk for ged-emacs-devel@m.gmane.org; Wed, 27 Aug 2008 10:49:17 +0200 Original-Received: from localhost ([127.0.0.1]:54327 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KYGhN-0002ED-3Z for ged-emacs-devel@m.gmane.org; Wed, 27 Aug 2008 04:48:17 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KYGhI-0002E8-8W for emacs-devel@gnu.org; Wed, 27 Aug 2008 04:48:12 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KYGhG-0002Dw-NY for emacs-devel@gnu.org; Wed, 27 Aug 2008 04:48:11 -0400 Original-Received: from [199.232.76.173] (port=44610 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KYGhG-0002Dt-D3 for emacs-devel@gnu.org; Wed, 27 Aug 2008 04:48:10 -0400 Original-Received: from viper.snap.net.nz ([202.37.101.25]:60112) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KYGhA-0004nM-Ui; Wed, 27 Aug 2008 04:48:05 -0400 Original-Received: from kahikatea.snap.net.nz (214.31.255.123.static.snap.net.nz [123.255.31.214]) by viper.snap.net.nz (Postfix) with ESMTP id F33892F4309; Wed, 27 Aug 2008 20:47:59 +1200 (NZST) Original-Received: by kahikatea.snap.net.nz (Postfix, from userid 1000) id 656B48FC6D; Wed, 27 Aug 2008 20:47:56 +1200 (NZST) In-Reply-To: X-Mailer: VM 7.19 under Emacs 22.2.50.3 X-detected-kernel: by monty-python.gnu.org: Linux 2.4-2.6 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:103012 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. > > No, if smerge-mode is causing information loss without user action that > should be fixed. Clearly it wasn't without user action. I think it should only enabled by default if it is the only natural choice. If that's what you mean by "fixed", then that may not always be possible. -- Nick http://www.inet.net.nz/~nickrob