svn commit: r1715358 - /subversion/trunk/tools/dev/svnmover/merge3.c

[ju...@apache.org]

Author: julianfoad
Date: Fri Nov 20 13:32:31 2015
New Revision: 1715358

URL: http://svn.apache.org/viewvc?rev=1715358&view=rev
Log:
A follow-up to r1715354.

* tools/dev/svnmover/merge3.c
  (brief_eid_and_name_or_nil): Delete, as this is now unused.
  (partial_relpath): Update the doc string.

Modified:
    subversion/trunk/tools/dev/svnmover/merge3.c

Modified: subversion/trunk/tools/dev/svnmover/merge3.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/svnmover/merge3.c?rev=1715358&r1=1715357&r2=1715358&view=diff
==============================================================================
--- subversion/trunk/tools/dev/svnmover/merge3.c (original)
+++ subversion/trunk/tools/dev/svnmover/merge3.c Fri Nov 20 13:32:31 2015
@@ -81,15 +81,6 @@ subbranch_str(svn_branch__state_t *branc
   return branch_str(subbranch, result_pool);
 }
 
-/*  */
-static const char *
-brief_eid_and_name_or_nil(svn_element__content_t *e,
-                          apr_pool_t *result_pool)
-{
-  return e ? apr_psprintf(result_pool, "%d/%s", e->parent_eid, e->name)
-           : "<nil>";
-}
-
 /* Return the longest known relative path leading to element EID in ELEMENTS.
  *
  * Set *BASE_EID_P to -1 if this path is rooted at the branch root;
@@ -99,10 +90,8 @@ brief_eid_and_name_or_nil(svn_element__c
  * If CYCLE_CONFLICTS is non-null, it maps each EID involved in a cycle to
  * [something]. If null, assume there are no cycles.
  *
- * If there is a cycle, return a special string indicating so.
- * ### Presently the special string doesn't indicate which part of the
- *     path is cyclic. TODO: return only the out-of-cycle part, plus the
- *     EID where it attaches to the cycle.
+ * If there is a cycle, set *BASE_EID_P to the EID of the nearest element
+ * that is part of a cycle and return the path relative to that element.
  */
 static const char *
 partial_relpath(int *base_eid_p,