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 2011/01/28 16:58:58 UTC
svn commit: r1064750 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Author: rhuijben
Date: Fri Jan 28 15:58:57 2011
New Revision: 1064750
URL: http://svn.apache.org/viewvc?rev=1064750&view=rev
Log:
* subversion/libsvn_wc/update_editor.c
(modcheck_found_node): If we already found a modification, don't check for
text modifications. This check is unneeded if we are just going to update
baton->all_edits_are_deletes based on status.
Modified:
subversion/trunk/subversion/libsvn_wc/update_editor.c
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1064750&r1=1064749&r2=1064750&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Fri Jan 28 15:58:57 2011
@@ -1316,7 +1316,7 @@ modcheck_found_node(const char *local_ab
modified = TRUE;
/* No need to check if we already have at least one non-delete
modification */
- else if (!baton->found_mod || baton->all_edits_are_deletes)
+ else if (!baton->found_mod)
SVN_ERR(entry_has_local_mods(&modified, baton->db, local_abspath,
db_kind, scratch_pool));
else