You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2011/11/14 16:40:59 UTC
svn commit: r1201756 - /subversion/trunk/subversion/libsvn_client/merge.c
Author: pburba
Date: Mon Nov 14 15:40:59 2011
New Revision: 1201756
URL: http://svn.apache.org/viewvc?rev=1201756&view=rev
Log:
* subversion/libsvn_client/merge.c
(subtree_touched_by_merge): Fix typo and reword comment for improved
clarity.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1201756&r1=1201755&r2=1201756&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Mon Nov 14 15:40:59 2011
@@ -7249,9 +7249,10 @@ path_is_subtree(const char *local_abspat
return FALSE;
}
-/* Return true if LOCAL_ABDPATH is equal to or a subtree of any of the paths
- in NOTIFY_B->MERGED_PATHS, NOTIFY_B->SKIPPED_PATHS, NOTIFY_B->ADDED_PATHS,
- or NOTIFY_B->CONFLICTED_PATHS. Return false otherwise. */
+/* Return true if LOCAL_ABSPATH is equal to, or is a subtree of, any of the
+ paths in NOTIFY_B->MERGED_PATHS, NOTIFY_B->SKIPPED_PATHS,
+ NOTIFY_B->ADDED_PATHS, or NOTIFY_B->CONFLICTED_PATHS. Return false
+ otherwise. */
static svn_boolean_t
subtree_touched_by_merge(const char *local_abspath,
notification_receiver_baton_t *notify_b,