svn commit: r885351 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c

[philip]

Author: philip
Date: Mon Nov 30 08:42:53 2009
New Revision: 885351

URL: http://svn.apache.org/viewvc?rev=885351&view=rev
Log:
* subversion/libsvn_wc/adm_ops.c
  (svn_wc__internal_remove_from_revision_control): Reorder boolean
    expression to avoid an uninitialised memory read.

Modified:
    subversion/trunk/subversion/libsvn_wc/adm_ops.c

Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=885351&r1=885350&r2=885351&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Mon Nov 30 08:42:53 2009
@@ -2435,7 +2435,7 @@
       if (destroy_wf)
         {
           /* Don't kill local mods. */
-          if (text_modified_p || (! wc_special && local_special))
+          if ((! wc_special && local_special) || text_modified_p)
             return svn_error_create(SVN_ERR_WC_LEFT_LOCAL_MOD, NULL, NULL);
           else  /* The working file is still present; remove it. */
             SVN_ERR(svn_io_remove_file2(local_abspath, TRUE, scratch_pool));