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

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.

-- 
Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org