svn commit: r1229339 - /subversion/trunk/subversion/libsvn_client/merge.c

[ju...@apache.org]

Author: julianfoad
Date: Mon Jan  9 20:34:34 2012
New Revision: 1229339

URL: http://svn.apache.org/viewvc?rev=1229339&view=rev
Log:
* subversion/libsvn_client/merge.c
  (merge_target_t, HONOR_MERGEINFO): Tweak doc strings.

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=1229339&r1=1229338&r2=1229339&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Mon Jan  9 20:34:34 2012
@@ -185,11 +185,13 @@ typedef struct merge_target_t
   /* Node kind of the WC node (at the start of the merge) */
   svn_node_kind_t kind;
 
-  /* URL and revision of the node */
+  /* URL of the node, or NULL if node is locally added */
   const char *url;
+
+  /* Revision of the node, or NULL if node is locally added */
   svn_revnum_t rev;
 
-  /* Repository root URL and UUID */
+  /* Repository root URL and UUID, even if node is locally added */
   url_uuid_t repos_root;
 
 } merge_target_t;
@@ -301,8 +303,8 @@ typedef struct merge_cmd_baton_t {
    changes to merge, for the merge described by MERGE_B.  Specifically, that
    is if the merge source server is capable of merge tracking, the left-side
    merge source is an ancestor of the right-side (or vice-versa), the merge
-   source repository is the same repository as the MERGE_B->TARGET_ABSPATH, and
-   ancestry is being considered.  */
+   source is in the same repository as the merge target, and ancestry is
+   being considered. */
 #define HONOR_MERGEINFO(merge_b) ((merge_b)->mergeinfo_capable      \
                                   && (merge_b)->sources_ancestral   \
                                   && (merge_b)->same_repos          \