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 2012/07/25 15:47:15 UTC

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

Author: julianfoad
Date: Wed Jul 25 13:47:15 2012
New Revision: 1365585

URL: http://svn.apache.org/viewvc?rev=1365585&view=rev
Log:
* subversion/libsvn_client/merge.c
  (get_operative_immediate_children): Update a parameter name in the doc
    string.

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=1365585&r1=1365584&r2=1365585&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Jul 25 13:47:15 2012
@@ -7496,7 +7496,7 @@ log_find_operative_subtree_revs(void *ba
    Set *OPERATIVE_CHILDREN to a hash (mapping const char * absolute
    working copy paths to those path's const char * repos absolute paths)
    containing all the immediate subtrees of MERGE_TARGET_ABSPATH which would
-   have a different diff applied if MERGE_SOURCE_REPOS_PATH
+   have a different diff applied if MERGE_SOURCE_FSPATH
    -r(OLDEST_REV - 1):YOUNGEST_REV were merged to MERGE_TARGET_ABSPATH at
    svn_depth_infinity rather than DEPTH.