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/03/13 10:38:14 UTC
svn commit: r1455849 - in /subversion/trunk/subversion/include: private/svn_wc_private.h svn_client.h

Author: philip
Date: Wed Mar 13 09:38:14 2013
New Revision: 1455849

URL: http://svn.apache.org/r1455849
Log:
Note the consequences of allow_mixed_revisions for move.

* subversion/include/private/svn_wc_private.h
  (svn_wc__move2): Tweak documentation.

* subversion/include/svn_client.h
  (svn_client_move6): Tweak documentation.

Modified:
    subversion/trunk/subversion/include/private/svn_wc_private.h
    subversion/trunk/subversion/include/svn_client.h

Modified: subversion/trunk/subversion/include/private/svn_wc_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_wc_private.h?rev=1455849&r1=1455848&r2=1455849&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Wed Mar 13 09:38:14 2013
@@ -1782,7 +1782,8 @@ svn_wc__resolve_conflicts(svn_wc_context
  * If @a allow_mixed_revisions is @c FALSE, #SVN_ERR_WC_MIXED_REVISIONS
  * will be raised if the move source is a mixed-revision subtree.
  * If @a allow_mixed_revisions is TRUE, a mixed-revision move source is
- * allowed. This parameter should be set to FALSE except where backwards
+ * allowed but the move will degrade to a copy and a delete without local
+ * move tracking. This parameter should be set to FALSE except where backwards
  * compatibility to svn_wc_move() is required.
  *
  * If @a cancel_func is non-NULL, call it with @a cancel_baton at

Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1455849&r1=1455848&r2=1455849&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Wed Mar 13 09:38:14 2013
@@ -4561,7 +4561,8 @@ svn_client_copy(svn_client_commit_info_t
  * If @a allow_mixed_revisions is @c FALSE, #SVN_ERR_WC_MIXED_REVISIONS
  * will be raised if the move source is a mixed-revision subtree.
  * If @a allow_mixed_revisions is TRUE, a mixed-revision move source is
- * allowed. This parameter should be set to FALSE except where backwards
+ * allowed but the move will degrade to a copy and a delete without local
+ * move tracking. This parameter should be set to FALSE except where backwards
  * compatibility to svn_client_move6() is required.
  *
  * If @a metadata_only is @c TRUE and moving a file in a working copy,