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 2014/04/30 17:13:17 UTC

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

Author: julianfoad
Date: Wed Apr 30 15:13:16 2014
New Revision: 1591341

URL: http://svn.apache.org/r1591341
Log:
* subversion/libsvn_client/merge.c
  (record_mergeinfo_for_dir_merge): Fix a cross-reference in a comment.

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=1591341&r1=1591340&r2=1591341&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Apr 30 15:13:16 2014
@@ -8611,7 +8611,7 @@ record_mergeinfo_for_dir_merge(svn_merge
 
           /* Allow mergeinfo on switched subtrees to elide to the
              repository. Otherwise limit elision to the merge target
-             for now.  do_directory_merge() will eventually try to
+             for now.  do_merge() will eventually try to
              elide that when the merge is complete. */
           SVN_ERR(svn_client__elide_mergeinfo(
             child->abspath,