svn commit: r1445614 - /subversion/trunk/subversion/libsvn_client/commit.c

[st...@apache.org]

Author: stsp
Date: Wed Feb 13 14:11:59 2013
New Revision: 1445614

URL: http://svn.apache.org/r1445614
Log:
* subversion/libsvn_client/commit.c
  (svn_client_commit6): Commit items might have both the ITEM_COPY and
   ITEM_DELETE flags set. Check these flags independently in order to
   catch the case where a moved-from path is comitted which has been
   replaced (i.e. the path has a copy shadowing the delete).

Modified:
    subversion/trunk/subversion/libsvn_client/commit.c

Modified: subversion/trunk/subversion/libsvn_client/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit.c?rev=1445614&r1=1445613&r2=1445614&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit.c Wed Feb 13 14:11:59 2013
@@ -848,7 +848,8 @@ svn_client_commit6(const apr_array_heade
                 }
             }
         }
-      else if (item->state_flags & SVN_CLIENT_COMMIT_ITEM_DELETE)
+
+      if (item->state_flags & SVN_CLIENT_COMMIT_ITEM_DELETE)
         {
           const char *moved_to_abspath;
           const char *copy_op_root_abspath;