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

Posted to commits@subversion.apache.org by ph...@apache.org on 2013/01/30 16:36:03 UTC

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

Author: philip
Date: Wed Jan 30 15:36:02 2013
New Revision: 1440475

URL: http://svn.apache.org/viewvc?rev=1440475&view=rev
Log:
* subversion/libsvn_client/merge.c (check_moved_away): Tweak docstring.

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=1440475&r1=1440474&r2=1440475&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Jan 30 15:36:02 2013
@@ -1399,9 +1399,9 @@ prepare_merge_props_changed(const apr_ar
   return SVN_NO_ERROR;
 }
 
-/* Indicate in *MOVED_AWAY whether the node at LOCAL_ABSPATH was
- * moved away locally. Do not raise an error if the node at LOCAL_ABSPATH
- * does not exist.
+/* Set *OP_ROOT_ABSPATH if the node at LOCAL_ABSPATH was moved away
+ * locally, or set *OP_ROOT_ABSPATH to NULL otherwise. Do not raise an
+ * error if the node at LOCAL_ABSPATH does not exist.
  *
  * ### Currently this looks at the highest moved-to but should merge
  * ### be looking at the lowest moved-to?  Or perhaps only the base