You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/02/02 15:56:01 UTC
svn commit: r1239655 -
/subversion/trunk/subversion/libsvn_client/commit_util.c
Author: stsp
Date: Thu Feb 2 14:56:00 2012
New Revision: 1239655
URL: http://svn.apache.org/viewvc?rev=1239655&view=rev
Log:
* subversion/libsvn_client/commit_util.c
(harvest_commitables): Tweak a comment for clarity.
Review by: rhuijben
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=1239655&r1=1239654&r2=1239655&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit_util.c Thu Feb 2 14:56:00 2012
@@ -834,14 +834,12 @@ harvest_committables(svn_wc_context_t *w
if (parent_added)
{
- /* The op-root of the parent must be part of the commit */
const char *copy_root_abspath;
svn_boolean_t parent_is_copy;
- /* Copies are always committed recursively as long as the
- * copy root is in the commit target list.
- * So for nodes copied along with a parent, the copy root path
- * is the dangling parent. See issue #4059. */
+ /* The parent is added, so either it is a copy, or a locally added
+ * directory. In either case, we require the op-root of the parent
+ * to be part of the commit. See issue #4059. */
SVN_ERR(svn_wc__node_get_origin(&parent_is_copy, NULL, NULL, NULL,
NULL, ©_root_abspath,
wc_ctx, parent_abspath,