You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/02/11 22:25:57 UTC
svn commit: r1444971 - /subversion/trunk/subversion/libsvn_wc/diff_editor.c
Author: rhuijben
Date: Mon Feb 11 21:25:57 2013
New Revision: 1444971
URL: http://svn.apache.org/r1444971
Log:
* subversion/libsvn_wc/diff_editor.c
(ensure_local_only_handled): Remove stray SVN_DBG() call.
(close_file): Don't depend on file added, just on the parent dir.
Modified:
subversion/trunk/subversion/libsvn_wc/diff_editor.c
Modified: subversion/trunk/subversion/libsvn_wc/diff_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff_editor.c?rev=1444971&r1=1444970&r2=1444971&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff_editor.c Mon Feb 11 21:25:57 2013
@@ -1299,8 +1299,6 @@ ensure_local_only_handled(struct dir_bat
if (svn_hash_gets(pb->compared, name))
return SVN_NO_ERROR;
- SVN_DBG(("Repos del %s: %d\n", name, repos_delete));
-
svn_hash_sets(pb->compared, apr_pstrdup(pb->pool, name), "");
SVN_ERR(ensure_local_info(pb, scratch_pool));
@@ -1850,9 +1848,8 @@ close_file(void *file_baton,
scratch_pool));
}
- if (fb->added
- && eb->local_before_remote
- && !pb->added
+ if (eb->local_before_remote
+ && !pb->added
&& !eb->ignore_ancestry)
{
SVN_ERR(ensure_local_only_handled(pb, fb->name, scratch_pool));