* subversion/libsvn_client/commit_util.c
  (harvest_committables): 

--This line, and those below, will be ignored--
Index: subversion/libsvn_client/commit_util.c
===================================================================
--- subversion/libsvn_client/commit_util.c	(revision 34248)
+++ subversion/libsvn_client/commit_util.c	(working copy)
@@ -356,7 +356,6 @@ harvest_committables(apr_hash_t *committ
       && (strcmp(entry->name, SVN_WC_ENTRY_THIS_DIR) == 0))
     {
       apr_array_header_t *conflicts;
-      const svn_wc_conflict_description_t *conflict;
       int i;
 
       conflicts = apr_array_make(pool, 0,
@@ -366,6 +365,10 @@ harvest_committables(apr_hash_t *committ
 
       for (i = 0; i < conflicts->nelts; i++)
         {
+          const svn_wc_conflict_description_t *conflict;
+          svn_wc_adm_access_t *child_adm_access;
+          const svn_wc_entry_t *child_entry = NULL;
+
           conflict = APR_ARRAY_IDX(conflicts, i,
                                    svn_wc_conflict_description_t *);
 
@@ -376,7 +379,16 @@ harvest_committables(apr_hash_t *committ
           /* So we've encountered a conflict that is included in DEPTH.
            * Bail out. */
 
-          if (SVN_WC__CL_MATCH(changelists, entry))
+          /* Get the child's entry, if it has one, else NULL. */
+          if (conflict->node_kind == svn_node_dir)
+            SVN_ERR(svn_wc_adm_retrieve(&child_adm_access, adm_access,
+                                        conflict->path, pool));
+          else
+            child_adm_access = adm_access;
+          SVN_ERR(svn_wc_entry(&child_entry, conflict->path, child_adm_access,
+                               TRUE, pool));
+
+          if (SVN_WC__CL_MATCH(changelists, child_entry))
             return svn_error_createf(
                      SVN_ERR_WC_FOUND_CONFLICT, NULL,
                      _("Aborting commit: '%s' remains in conflict"),