From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Giorgos Keramidas Newsgroups: gmane.emacs.help Subject: Re: Ediff and merge Date: Sun, 17 May 2009 07:30:31 +0300 Organization: SunSITE.dk - Supporting Open source Message-ID: <877i0gtkpk.fsf@kobe.laptop> References: <87bppt3c1c.fsf@kobe.laptop> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1242535279 31170 80.91.229.12 (17 May 2009 04:41:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 17 May 2009 04:41:19 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Sun May 17 06:41:12 2009 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1M5YBT-0004El-4T for geh-help-gnu-emacs@m.gmane.org; Sun, 17 May 2009 06:41:11 +0200 Original-Received: from localhost ([127.0.0.1]:60479 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M5YBS-0002gK-Dt for geh-help-gnu-emacs@m.gmane.org; Sun, 17 May 2009 00:41:10 -0400 Original-Path: news.stanford.edu!headwall.stanford.edu!newsfeed.news2me.com!uio.no!news.banetele.no!dotsrc.org!filter.dotsrc.org!news.dotsrc.org!not-for-mail Original-Newsgroups: gnu.emacs.help User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.93 (berkeley-unix) Cancel-Lock: sha1:W9trGfQ4dLbeiLBvQt/v4FZP/p8= Original-Lines: 46 Original-NNTP-Posting-Host: 77.49.53.220 Original-X-Trace: news.sunsite.dk DXC=]@3j5G954DRgcbniiOP=_RYSB=nbEKnk[ML^MjWbH?lJH1Tkj\5U?NNhN:T2U^0PQ_Nm7k?Q Original-X-Complaints-To: staff@sunsite.dk Original-Xref: news.stanford.edu gnu.emacs.help:169254 X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.help:64511 Archived-At: On Sat, 16 May 2009 12:28:23 +0200, Rasmus Pank Roulund wrote: > Hello Giorgos, > Yeah ediff is great. I use svn from within emacs with psvn.el. The > tool is called svn-status within emacs. It has built in support for > Ediff. I just RET on a conflicted file and it go to SMerge minor mode > (I think) and from there I can enter ediff. > > However, I think "R" is the command I am looking for. When I "A" and > "B"'ed through all the conflict points and I am done I need the > command to end it naturally. Ah, I see. I haven't used psvn (the VC support for svn is mostly fine for what I usually do), so I am not sure if the script I posted can fit well with psvn. > The script you posted looks interesting. Would you be able to post it > again as an attached file? The line breaking has been broken in my > Gnus. Is this script mainly for command line or will it have an effect > when I use SVN through an emacs-mode like psvn.el? Sure, I can attach it, but I am reading gnu.emacs.help posts through NNTP, so it may not come through. I uploaded a copy to: http://people.freebsd.org/~keramida/svn-ediff-merge.sh I have only used the script with the command-line merges of "svn merge". It may be easy to hack the script a bit and integrate it with psvn, but I am not sure if that would work or if it would useful. > This is really the funcitonallity I am looking for! Is it built into > ediff or do I need your script to perform this action? It is part of the interaction between the command-line svn(1) utility and the way the script works. svn(1) passes filename paths to the script. These filename arguments are described in the toplevel comments of the script: # BASE = base revision; the common ancestor of $other and $local # OTHER = parent branch version # LOCAL = locally modified version # WC = working copy; the file where merge results should be saved The `WC' filename (positional argument $4) is the path of the file inside the subversion workspace, so the script tries to save any successful merge result to that path.