From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.devel Subject: Re: svn and smerge-mode Date: Wed, 27 Aug 2008 11:37:54 +0900 Message-ID: References: <18611.52098.805757.689913@kahikatea.snap.net.nz> Reply-To: Miles Bader NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1219804705 13047 80.91.229.12 (27 Aug 2008 02:38:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 Aug 2008 02:38:25 +0000 (UTC) Cc: emacs-devel@gnu.org To: Nick Roberts Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Aug 27 04:39:17 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 1KYAwE-0006Tc-4O for ged-emacs-devel@m.gmane.org; Wed, 27 Aug 2008 04:39:14 +0200 Original-Received: from localhost ([127.0.0.1]:38888 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KYAvF-0005lx-F4 for ged-emacs-devel@m.gmane.org; Tue, 26 Aug 2008 22:38:13 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KYAvA-0005jQ-9d for emacs-devel@gnu.org; Tue, 26 Aug 2008 22:38:08 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KYAv8-0005h3-IY for emacs-devel@gnu.org; Tue, 26 Aug 2008 22:38:07 -0400 Original-Received: from [199.232.76.173] (port=45685 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KYAv8-0005go-62 for emacs-devel@gnu.org; Tue, 26 Aug 2008 22:38:06 -0400 Original-Received: from tyo202.gate.nec.co.jp ([202.32.8.206]:38555) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KYAv3-0003Vl-In; Tue, 26 Aug 2008 22:38:02 -0400 Original-Received: from relay11.aps.necel.com ([10.29.19.46]) by tyo202.gate.nec.co.jp (8.13.8/8.13.4) with ESMTP id m7R2brNw003597; Wed, 27 Aug 2008 11:37:56 +0900 (JST) Original-Received: from relay11.aps.necel.com ([10.29.19.24] [10.29.19.24]) by relay11.aps.necel.com with ESMTP; Wed, 27 Aug 2008 11:37:56 +0900 Original-Received: from dhapc248.dev.necel.com ([10.114.112.215] [10.114.112.215]) by relay11.aps.necel.com with ESMTP; Wed, 27 Aug 2008 11:37:55 +0900 Original-Received: by dhapc248.dev.necel.com (Postfix, from userid 31295) id 655AB5C6; Wed, 27 Aug 2008 11:37:55 +0900 (JST) System-Type: i686-pc-linux-gnu Blat: Foop In-Reply-To: <18611.52098.805757.689913@kahikatea.snap.net.nz> (Nick Roberts's message of "Tue, 26 Aug 2008 21:23:14 +1200") Original-Lines: 13 X-detected-kernel: by monty-python.gnu.org: Solaris 8 (1) 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:103005 Archived-At: Nick Roberts writes: > 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. -Miles -- Run away! Run away!