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 2015/08/26 16:00:55 UTC
svn commit: r1697935 -
/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
Author: julianfoad
Date: Wed Aug 26 14:00:55 2015
New Revision: 1697935
URL: http://svn.apache.org/r1697935
Log:
On the 'move-tracking-2' branch: Fix the 'mv' command and its notifications.
* subversion/svnmover/svnmover.c
(do_move): Calculate the moved-from path before moving the
element, as doing it afterwards is too late and so we were displaying
the target path instead.
(execute): When doing a normal move, don't then call the interactive
cross-branch move code as well, and don't display a notification here
because do_move() already did so.
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=1697935&r1=1697934&r2=1697935&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c (original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Wed Aug 26 14:00:55 2015
@@ -2583,6 +2583,7 @@ do_move(svn_editor3_t *editor,
{
const char *branch_id = svn_branch_get_id(el_rev->branch,
scratch_pool);
+ const char *from_path = el_rev_id_to_path(el_rev, scratch_pool);
/* New payload shall be the same as before */
svn_branch_el_rev_content_t *existing_element
= svn_branch_get_element(el_rev->branch, el_rev->eid);
@@ -2595,7 +2596,7 @@ do_move(svn_editor3_t *editor,
branch_peid_name_to_path(to_parent_el_rev->branch,
to_parent_el_rev->eid, to_name,
scratch_pool),
- el_rev_id_to_path(el_rev, scratch_pool));
+ from_path);
return SVN_NO_ERROR;
}
@@ -3174,15 +3175,15 @@ execute(svnmover_wc_t *wc,
SVN_ERR(do_move(editor, arg[0]->el_rev,
arg[1]->parent_el_rev, arg[1]->path_name,
iterpool));
- notify_v("V %s (from %s)",
- action->relpath[1], action->relpath[0]);
}
-
- SVN_ERR(do_interactive_cross_branch_move(editor,
- arg[0]->el_rev,
- arg[1]->parent_el_rev,
- arg[1]->path_name,
- iterpool));
+ else
+ {
+ SVN_ERR(do_interactive_cross_branch_move(editor,
+ arg[0]->el_rev,
+ arg[1]->parent_el_rev,
+ arg[1]->path_name,
+ iterpool));
+ }
break;
case ACTION_CP: