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: Wed, 27 Aug 2008 13:47:08 -0400 Message-ID: References: <18611.52098.805757.689913@kahikatea.snap.net.nz> <18613.5027.950825.923293@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 1219859346 7798 80.91.229.12 (27 Aug 2008 17:49:06 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 Aug 2008 17:49:06 +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 19:49:59 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 1KYP80-0002kv-2S for ged-emacs-devel@m.gmane.org; Wed, 27 Aug 2008 19:48:20 +0200 Original-Received: from localhost ([127.0.0.1]:40761 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KYP71-0005qv-Qd for ged-emacs-devel@m.gmane.org; Wed, 27 Aug 2008 13:47:19 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KYP6y-0005qm-4L for emacs-devel@gnu.org; Wed, 27 Aug 2008 13:47:16 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KYP6w-0005qB-Pb for emacs-devel@gnu.org; Wed, 27 Aug 2008 13:47:15 -0400 Original-Received: from [199.232.76.173] (port=34394 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KYP6w-0005pt-Ji for emacs-devel@gnu.org; Wed, 27 Aug 2008 13:47:14 -0400 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:60238) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KYP6v-0006Cn-PU for emacs-devel@gnu.org; Wed, 27 Aug 2008 13:47:14 -0400 Original-Received: from alfajor.home (vpn-132-204-232-92.acd.umontreal.ca [132.204.232.92]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id m7RHl8qp018751; Wed, 27 Aug 2008 13:47:08 -0400 Original-Received: by alfajor.home (Postfix, from userid 20848) id 87E561C168; Wed, 27 Aug 2008 13:47:08 -0400 (EDT) In-Reply-To: <18613.5027.950825.923293@kahikatea.snap.net.nz> (Nick Roberts's message of "Wed, 27 Aug 2008 20:43:15 +1200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV3091=0 X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) 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:103032 Archived-At: >> 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? > I just use it too infrequently to remember how it works. > ISTR I lost my original working (.#) file trying to exit smerge-ediff. It > wasn't clear to me where the changes I had selected were going to end up (I > thought I would need to save the *ediff-merge* buffer). Even though I quit > smerge-ediff without selecting any changes, I was told: > Conflict resolution finished; you may save the buffer > Evidently this actually only differed by the conflict markers, > e.g.,"<<<<<<< filename" vs "<<<<<<< variant A"). > I thought that when I saved this buffer the original working was removed > although I can't reproduce this now. > In summary, smerge-mode seems to start off quite innocently but may lead you > into places that you don't want to be. So it sounds like a problem in the smerge-ediff code. I never use(d) that code, so it's not really a surprise. If you can provide a reproducible testcase, that would be very helpful, but otherwise just give us as detailed a description as possible (e.g. what .#* file are you talking about?). Stefan