svn commit: r1691038 - /subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c

[ju...@apache.org]

Author: julianfoad
Date: Tue Jul 14 17:36:24 2015
New Revision: 1691038

URL: http://svn.apache.org/r1691038
Log:
On the 'move-tracking-2' branch: Make the moving-by-branch-and-delete message
much more verbose.

* subversion/svnmover/svnmover.c
  (do_move): Tweak the message.

Modified:
    subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c

Modified: subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c?rev=1691038&r1=1691037&r2=1691038&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c (original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Tue Jul 14 17:36:24 2015
@@ -2083,12 +2083,15 @@ do_move(svn_editor3_t *editor,
   /* Instantiate same elements in another branch */
   if (1 /*###*/)
     {
-      /* Here the elements moved from the source branch will overwrite any
-         corresponding elements that already exist in the target branch.
-         We could instead check and either throw an error or fall back to
-         copy-and-delete in that case. */
-
-      notify_v("mv: moving by branch-and-delete");
+      notify_v(
+        "mv: Moving by branch-and-delete, because the target of the requested "
+        "move is in a different branch.\n"
+        "In the current implementation of this experimental UI, each element "
+        "instance from the source branch subtree will overwrite any instance "
+        "of the same element that already exists in the target branch."
+        );
+      /* We could instead either throw an error or fall back to copy-and-delete
+         if any moved element already exists in target branch. */
 
       SVN_ERR(move_by_branch_and_delete(editor, el_rev,
                                         to_parent_el_rev->branch,