Re: [PATCH] vc-svn: Enable vc-merge, avoid "svn status -uv"

Martin Pool wrote:

>On 27 Mar 2003, Branko ??ibej <brane@xbc.nu> wrote:
>
>
>>Couldn't we add an option here to run emerge for conflict resolution,
>>instead of leaving the user to stew in their own juice?
>>
>>
>
>Yes, I think that would be an excellent idea, and I intend to write it
>when I can. Because Subversion provides the files for a 3-way merge
>it should work well, although we can also give the user the option to
>use smerge or something else.
>
>I think this patch doesn't make the situation any worse than it was
>before: at least now you can merge nonconflicting changes, and newly
>added files don't break. Are you happy to commit it? I'd like to
>keep working on vc-svn and psvn.
>
>

O.K., just as long as you have this option in mind, I'm happy. :-)

The patch looks O.K. to me, but I'm not competent to comment on elisp
code; I haven't doen enought of that. Luckily, there are people here who
have. Karl?

-- 
Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org