Author: neels
Date: Tue Aug 3 22:45:42 2010
New Revision: 982056
URL: http://svn.apache.org/viewvc?rev=982056&view=rev
Log:
* subversion/libsvn_client/merge.c (merge_file_changed):
Treat svn_depth_unknown as svn_depth_infinity when checking whether to
skip child nodes. Because of r981470, this doesn't fix anything anymore,
but it still seems the right thing to do.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=982056&r1=982055&r2=982056&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Aug 3 22:45:42 2010
@@ -1349,7 +1349,9 @@ merge_file_changed(const char *local_dir
SVN_ERR(svn_wc__node_get_depth(&parent_depth, merge_b->ctx->wc_ctx,
svn_dirent_dirname(mine_abspath, subpool),
subpool));
- if (wc_kind == svn_node_none && parent_depth < svn_depth_files)
+ if (wc_kind == svn_node_none
+ && parent_depth < svn_depth_files
+ && parent_depth != svn_depth_unknown)
{
if (content_state)
*content_state = svn_wc_notify_state_missing;
