Re: skel_usage status

Ben Collins-Sussman <sussman@collab.net> writes:

> so I didn't run
> 'make check', thinking "why bother, we have no merge tests yet."

I didn't realise this :-(

It appears the changes I made recently to 'svn rm' affect 'svn merge',
merge may need a '--force' argument to allow it to remove locally
modified files/directories.

So what is the status of 'svn merge' at the moment, how much is
expected to work? When I test it by hand, merging files seems to work
but adding/removing directories fails, even if I patch round the
--force problem. Is this a know limitation or did this work in the
past?

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