Author: rhuijben
Date: Fri Apr 15 15:24:36 2011
New Revision: 1092740
URL: http://svn.apache.org/viewvc?rev=1092740&view=rev
Log:
* subversion/libsvn_client/commit_util.c
(svn_client__condense_commit_items): Fix a stupid typo that noted
a delete under a replace as a delete under a delete.
Modified:
subversion/trunk/subversion/libsvn_client/commit_util.c
Modified: subversion/trunk/subversion/libsvn_client/commit_util.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit_util.c?rev=1092740&r1=1092739&r2=1092740&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit_util.c Fri Apr 15 15:24:36
2011
@@ -1027,7 +1027,7 @@ svn_client__condense_commit_items(const
&& !(item->state_flags & SVN_CLIENT_COMMIT_ITEM_ADD)
/* Last was a delete */
&& (last_item->state_flags & SVN_CLIENT_COMMIT_ITEM_DELETE)
- && !(item->state_flags & SVN_CLIENT_COMMIT_ITEM_ADD)
+ && !(last_item->state_flags & SVN_CLIENT_COMMIT_ITEM_ADD)
/* And last_item is an ancestor of item */
&& svn_uri_is_ancestor(last_item->url, item->url))
{
