You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/05/05 12:37:46 UTC
svn commit: r941236 -
/subversion/trunk/subversion/libsvn_client/commit_util.c
Author: philip
Date: Wed May 5 10:37:46 2010
New Revision: 941236
URL: http://svn.apache.org/viewvc?rev=941236&view=rev
Log:
* subversion/libsvn_client/commit_util.c
(svn_client__harvest_committables): Pass the target path directly to
bail_on_conflicted_ancestor.
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=941236&r1=941235&r2=941236&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit_util.c Wed May 5 10:37:46 2010
@@ -1123,11 +1123,7 @@ svn_client__harvest_committables(apr_has
/* Handle our TARGET. */
/* Make sure this isn't inside a working copy subtree that is
* marked as tree-conflicted. */
- SVN_ERR(bail_on_tree_conflicted_ancestor(ctx->wc_ctx,
- (entry->kind == svn_node_dir
- ? target_abspath
- : svn_dirent_dirname(
- target_abspath, iterpool)),
+ SVN_ERR(bail_on_tree_conflicted_ancestor(ctx->wc_ctx, target_abspath,
iterpool));
SVN_ERR(harvest_committables(*committables, *lock_tokens, target_abspath,