Log Message:
Fix Issue #1769: Allow svn merge to continue if directory is 'deleted'.
* subversion/libsvn_client/diff.c
(merge_dir_added) : Change 'show_hidden' to FALSE to prevent 'entry'
from being returned when directory is 'deleted', and allow svn merge
to continue.
Index: subversion/libsvn_client/diff.c
===================================================================
--- subversion/libsvn_client/diff.c (revision 9455)
+++ subversion/libsvn_client/diff.c (working copy)
@@ -976,7 +976,7 @@
switch (kind)
{
case svn_node_none:
- SVN_ERR (svn_wc_entry (&entry, path, adm_access, TRUE, subpool));
+ SVN_ERR (svn_wc_entry (&entry, path, adm_access, FALSE,
subpool));
if (entry && entry->schedule != svn_wc_schedule_delete)
{
/* Versioned but missing */
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Apr 23 06:10:01 2004