svn commit: r1639595 - in /subversion/branches/move-tracking-2: BRANCH-README subversion/svnmover/svnmover.c

[ju...@apache.org]

Author: julianfoad
Date: Fri Nov 14 10:36:09 2014
New Revision: 1639595

URL: http://svn.apache.org/r1639595
Log:
On the 'move-tracking-2' branch: Make 'svnmover merge' interpret the
three arguments consistently as relative to the given base URL.

* BRANCH-README
  Remove the suggestion to do something slightly different.

* subversion/svnmover/svnmover.c
  (execute): Don't re-interpret the first and third arguments of 'merge'.

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

Modified: subversion/branches/move-tracking-2/BRANCH-README
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/BRANCH-README?rev=1639595&r1=1639594&r2=1639595&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/BRANCH-README (original)
+++ subversion/branches/move-tracking-2/BRANCH-README Fri Nov 14 10:36:09 2014
@@ -40,8 +40,6 @@ Work on this branch:
     To do:
       dissolve (unbranchify)
       provide a way to specify a mixed-rev base state
-      merge: interpret the three arguments consistently as relative to
-        the repo root
       synthesize element tracking info (instead of aborting) when reading
         a revision that was committed by a non-move-tracking client
       make the user interface degrade cross-branch moves so that the user

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=1639595&r1=1639594&r2=1639595&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c (original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Fri Nov 14 10:36:09 2014
@@ -1081,14 +1081,6 @@ execute(const apr_array_header_t *action
           break;
         case ACTION_MERGE:
           {
-            /* Look up path[0] (FROM) and path[2] (YCA) relative to repo
-               root, unlike path[1] (TO) which is relative to anchor URL. */
-            SVN_ERR(find_el_rev_by_rrpath_rev(
-                      &el_rev[0], editor, revnum[0], action->path[0],
-                      pool, pool));
-            SVN_ERR(find_el_rev_by_rrpath_rev(
-                      &el_rev[2], editor, revnum[2], action->path[2],
-                      pool, pool));
             VERIFY_EID_EXISTS("merge", 0);
             VERIFY_EID_EXISTS("merge", 1);
             VERIFY_EID_EXISTS("merge", 2);
@@ -1254,7 +1246,6 @@ usage(FILE *stream, apr_pool_t *pool)
       "  diff LEFT RIGHT        : diff LEFT to RIGHT\n"
       "  diff-e LEFT RIGHT      : diff LEFT to RIGHT (element-focused output)\n"
       "  merge FROM TO YCA@REV  : merge changes YCA->FROM and YCA->TO into TO\n"
-      "                           (FROM and YCA are relative to repo, not to root-URL)\n"
       "  cp REV SRC-URL DST-URL : copy SRC-URL@REV to DST-URL\n"
       "  mv SRC-URL DST-URL     : move SRC-URL to DST-URL\n"
       "  rm URL                 : delete URL\n"