svn commit: r1677758 - /subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c

[ju...@apache.org]

Author: julianfoad
Date: Tue May  5 09:19:13 2015
New Revision: 1677758

URL: http://svn.apache.org/r1677758
Log:
On the 'move-tracking-2' branch: Add comments; fix a typo.

* subversion/svnmover/svnmover.c
  (branch_info): Fix a typo in the doc string.
  (subtree_diff): Add a comment.
  (svn_branch_diff_r): Add a comment.

Modified:
    subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c

Modified: subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c?rev=1677758&r1=1677757&r2=1677758&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c (original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Tue May  5 09:19:13 2015
@@ -442,7 +442,7 @@ branch_id_and_path(svn_branch_state_t *b
                       svn_branch_get_root_rrpath(branch, result_pool));
 }
 
-/* Show the id and path of BRANCH. If VERBOSE is true, alse list its elements.
+/* Show the id and path of BRANCH. If VERBOSE is true, also list its elements.
  */
 static svn_error_t *
 branch_info(svn_branch_state_t *branch,
@@ -1014,6 +1014,10 @@ typedef struct diff_item_t
 /* Return differences between branch subtrees S_LEFT and S_RIGHT.
  *
  * Set *DIFF_CHANGES to an array of (diff_item_t).
+ *
+ * ### This requires 'subtrees' only in order to produce the 'relpath'
+ *     fields in the output. Other than that, it would work with arbitrary
+ *     sets of elements.
  */
 static svn_error_t *
 subtree_diff(svn_array_t **diff_changes,
@@ -1261,6 +1265,7 @@ svn_branch_diff_r(svn_editor3_t *editor,
       SVN_ERR(diff_func(editor, left, right, prefix, header, scratch_pool));
     }
 
+  /* recurse into each subbranch that exists in LEFT and/or in RIGHT */
   subbranches_l = get_subbranches(left ? left->branch : NULL,
                                   left ? left->eid : -1,
                                   scratch_pool, scratch_pool);