subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1199721 - in /subversion/trunk/subversion: include/svn_client.h libsvn_client/merge.c
Date Wed, 09 Nov 2011 12:47:32 GMT
Author: julianfoad
Date: Wed Nov  9 12:47:31 2011
New Revision: 1199721

URL: http://svn.apache.org/viewvc?rev=1199721&view=rev
Log:
Update doc string cross-references after svn_client_merge3() was revved to
svn_client_merge4().

* subversion/include/svn_client.h
  (svn_client_merge_reintegrate): Update doc string.

* subversion/libsvn_client/merge.c
  (remove_noop_subtree_ranges): Update comment.

Modified:
    subversion/trunk/subversion/include/svn_client.h
    subversion/trunk/subversion/libsvn_client/merge.c

Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1199721&r1=1199720&r2=1199721&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Wed Nov  9 12:47:31 2011
@@ -3443,10 +3443,10 @@ svn_client_merge(const char *source1,
  * pristine, unswitched working copy -- in other words, it must
  * reflect a single revision tree, the "target".  The mergeinfo on @a
  * source must reflect that all of the target has been merged into it.
- * Then this behaves like a merge with svn_client_merge3() from the
+ * Then this behaves like a merge with svn_client_merge4() from the
  * target's URL to the source.
  *
- * All other options are handled identically to svn_client_merge3().
+ * All other options are handled identically to svn_client_merge4().
  * The depth of the merge is always #svn_depth_infinity.
  *
  * @since New in 1.5.

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1199721&r1=1199720&r2=1199721&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Nov  9 12:47:31 2011
@@ -8308,7 +8308,7 @@ remove_noop_subtree_ranges(const char *u
    paths and the values are the new mergeinfos for each.  Allocate additions
    to RESULT_CATALOG in pool which RESULT_CATALOG was created in.
 
-   Handle DEPTH as documented for svn_client_merge3().
+   Handle DEPTH as documented for svn_client_merge4().
 
    If ABORT_ON_CONFLICTS is TRUE raise an SVN_ERR_WC_FOUND_CONFLICT error
    if any merge conflicts occur.



Mime
View raw message