Branko Čibej wrote:
> xsteve@tigris.org wrote:
>
>> Author: xsteve
>> Date: Thu Nov 11 15:08:02 2004
>> New Revision: 11846
>>
>> Modified:
>> trunk/contrib/client-side/psvn/psvn.el
>> Log:
>> 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.
By the way, svn info on the conflicted file will even tell you which
files to push at emerge.
-- 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 22:03:19 2004