[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r11846 - trunk/contrib/client-side/psvn

From: Branko Čibej <brane_at_xbc.nu>
Date: 2004-11-12 06:41:46 CET

xsteve@tigris.org wrote:

>Author: xsteve
>Date: Thu Nov 11 15:08:02 2004
>New Revision: 11846
> trunk/contrib/client-side/psvn/psvn.el
>Added support to resolve conflicts (patch from Pavel Hlavnicka <pavel@gingerall.cz>)
>* trunk/contrib/client-side/psvn/psvn.el:
> (svn-resolve-conflicts-ediff): New function. Use ediff to resolve conflicts
Ah... Wouldn't emerge work much better than ediff? When you have a
conflict, the working copy contains cleartext versions of all three
files base, head and working, and the reason we put them there is
precisely so that 3-way merges like emerge can use them. It's so much
more logical to feed those three files into emerge than this parsing of
conflict markers, which BTW will not necessarily work correctly.

-- Brane

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Nov 12 06:41:44 2004

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.