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: svn and smerge-mode Date: Tue, 26 Aug 2008 21:23:14 +1200 Message-ID: <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 1219742681 32622 80.91.229.12 (26 Aug 2008 09:24:41 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 26 Aug 2008 09:24:41 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Aug 26 11:25:34 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 1KXun6-0003vz-TK for ged-emacs-devel@m.gmane.org; Tue, 26 Aug 2008 11:24:45 +0200 Original-Received: from localhost ([127.0.0.1]:54929 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KXum8-0004cV-EM for ged-emacs-devel@m.gmane.org; Tue, 26 Aug 2008 05:23:44 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KXuly-0004aN-8n for emacs-devel@gnu.org; Tue, 26 Aug 2008 05:23:34 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KXulv-0004YY-SB for emacs-devel@gnu.org; Tue, 26 Aug 2008 05:23:33 -0400 Original-Received: from [199.232.76.173] (port=44473 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KXulv-0004Y8-Fq for emacs-devel@gnu.org; Tue, 26 Aug 2008 05:23:31 -0400 Original-Received: from viper.snap.net.nz ([202.37.101.25]:46376) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KXulu-0007FP-Vi for emacs-devel@gnu.org; Tue, 26 Aug 2008 05:23:31 -0400 Original-Received: from kahikatea.snap.net.nz (59.60.255.123.dynamic.snap.net.nz [123.255.60.59]) by viper.snap.net.nz (Postfix) with ESMTP id 27EF52F41E0 for ; Tue, 26 Aug 2008 21:23:18 +1200 (NZST) Original-Received: by kahikatea.snap.net.nz (Postfix, from userid 1000) id F17B68FC6D; Tue, 26 Aug 2008 21:23:15 +1200 (NZST) 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:102979 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. -- Nick http://www.inet.net.nz/~nickrob