Re: svn commit: rev 6810 - in trunk/subversion: include libsvn_client libsvn_wc tests/clients/cmdline

sussman@tigris.org wrote:
>
> Author: sussman
> Date: Thu Aug 21 00:39:42 2003
> New Revision: 6810
>
> Modified:
> trunk/subversion/include/svn_wc.h
> trunk/subversion/libsvn_client/diff.c
> trunk/subversion/libsvn_client/repos_diff.c
> trunk/subversion/libsvn_wc/diff.c
> trunk/subversion/tests/clients/cmdline/merge_tests.py
> Log:
> Fix issue #1425: don't let 'svn merge' bomb out when it hits
> unversioned obstructions during adds/deletes/changes of files/dirs.
> Instead, just 'skip' them and move on. This allows tree-deltas to
> simply have "failed hunks", which happens all the time in patch

Isn't that "failed chunks"???

Blair

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Aug 21 15:40:13 2003