Author: pburba
Date: Fri Nov 18 18:32:59 2011
New Revision: 1203784
URL: http://svn.apache.org/viewvc?rev=1203784&view=rev
Log:
Doc string fix.
* subversion/libsvn_client/merge.c
(subtree_touched_by_merge): Correct doc string, it was backwards.
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=1203784&r1=1203783&r2=1203784&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Nov 18 18:32:59 2011
@@ -7180,10 +7180,9 @@ path_is_subtree(const char *local_abspat
return FALSE;
}
-/* 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. */
+/* Return true if any path in NOTIFY_B->MERGED_PATHS, NOTIFY_B->SKIPPED_PATHS,
+ NOTIFY_B->ADDED_PATHS, or NOTIFY_B->CONFLICTED_PATHS is equal to, or is a
+ subtree of LOCAL_ABSPATH. Return false otherwise. */
static svn_boolean_t
subtree_touched_by_merge(const char *local_abspath,
notification_receiver_baton_t *notify_b,
