You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ju...@apache.org on 2015/09/23 10:38:38 UTC

svn commit: r1704780 - /subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h

Author: julianfoad
Date: Wed Sep 23 08:38:37 2015
New Revision: 1704780

URL: http://svn.apache.org/viewvc?rev=1704780&view=rev
Log:
On the 'move-tracking-2' branch: Tweak comments.

* subversion/include/private/svn_branch.h
  (svn_branch_instantiate_subtree): Correct the doc string.
  (svn_branch_branch_subtree): Fix a typo in the doc string.

Modified:
    subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h

Modified: subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h?rev=1704780&r1=1704779&r2=1704780&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h Wed Sep 23 08:38:37 2015
@@ -553,8 +553,10 @@ svn_branch_purge_r(svn_branch_state_t *b
  * Also branch the subbranches in FROM_SUBTREE, creating corresponding new
  * subbranches in TO_BRANCH, recursively.
  *
- * NEW_PARENT_EID MUST be an existing element in TO_BRANCH. It may be the
- * root element of TO_BRANCH.
+ * If FROM_SUBTREE.root_eid is the same as TO_BRANCH.root_eid, then
+ * (NEW_PARENT_EID, NEW_NAME) must be (-1, ""); otherwise, NEW_PARENT_EID
+ * must be an existing element (it may be the root element) of TO_BRANCH and
+ * NEW_NAME must not be not "".
  */
 svn_error_t *
 svn_branch_instantiate_subtree(svn_branch_state_t *to_branch,
@@ -571,7 +573,7 @@ svn_branch_instantiate_subtree(svn_branc
  * specified in FROM_SUBTREE, recursively.
  *
  * If TO_OUTER_BRANCH is NULL, create a top-level branch with a new top-level
- * branch number, ignoring TO_OUTER_EID. Otherise, create a branch that claims
+ * branch number, ignoring TO_OUTER_EID. Otherwise, create a branch that claims
  * to be nested under TO_OUTER_BRANCH:TO_OUTER_EID, but do not require that
  * a subbranch root element exists there, nor create one.
  *