You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Branko Čibej <br...@xbc.nu> on 2004/11/12 05:41:46 UTC
Re: svn commit: r11846 - trunk/contrib/client-side/psvn
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 <pa...@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
Re: svn commit: r11846 - trunk/contrib/client-side/psvn
Posted by Branko Čibej <br...@xbc.nu>.
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
>> <pa...@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