From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Rasmus Pank Roulund Newsgroups: gmane.emacs.help Subject: Re: Ediff and merge Date: Sat, 16 May 2009 12:28:23 +0200 Message-ID: <87ab5dxry0.fsf@rasmus.WORKGROUP> 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 1242469808 3144 80.91.229.12 (16 May 2009 10:30:08 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 May 2009 10:30:08 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Sat May 16 12:30:02 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 1M5H9U-00024B-Nh for geh-help-gnu-emacs@m.gmane.org; Sat, 16 May 2009 12:30:01 +0200 Original-Received: from localhost ([127.0.0.1]:46910 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M5H9T-0005mI-MJ for geh-help-gnu-emacs@m.gmane.org; Sat, 16 May 2009 06:29:59 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M5H95-0005k9-2r for help-gnu-emacs@gnu.org; Sat, 16 May 2009 06:29:35 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M5H91-0005eu-0o for help-gnu-emacs@gnu.org; Sat, 16 May 2009 06:29:34 -0400 Original-Received: from [199.232.76.173] (port=50066 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M5H90-0005dq-9x for help-gnu-emacs@gnu.org; Sat, 16 May 2009 06:29:30 -0400 Original-Received: from main.gmane.org ([80.91.229.2]:53987 helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1M5H8z-00016p-1e for help-gnu-emacs@gnu.org; Sat, 16 May 2009 06:29:29 -0400 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1M5H8C-0006uN-19 for help-gnu-emacs@gnu.org; Sat, 16 May 2009 10:28:40 +0000 Original-Received: from port293.ds1-aboes.adsl.cybercity.dk ([212.242.226.46]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 16 May 2009 10:28:40 +0000 Original-Received: from rasmus.pank by port293.ds1-aboes.adsl.cybercity.dk with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 16 May 2009 10:28:40 +0000 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 26 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: port293.ds1-aboes.adsl.cybercity.dk User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.92 (gnu/linux) Cancel-Lock: sha1:jZKErbS+4Typ+dz+YgwZI3BGeGg= X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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:64486 Archived-At: 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. 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? > When you save the merged buffer, the script will take care of saving > the merged file in your workspace. Then you can type `r' (resolved) > at the svn merge prompt, and you are done. This is really the funcitonallity I am looking for! Is it built into ediff or do I need your script to perform this action? Thank you so much for your help! Rasmus