Author: hwright
Date: Fri Apr 13 20:27:50 2012
New Revision: 1325936
URL: http://svn.apache.org/viewvc?rev=1325936&view=rev
Log:
On the ev2-export branch:
* subversion/libsvn_client/copy.c
(drive_single_path): Use the correct path for doing comparisons.
Modified:
subversion/branches/ev2-export/subversion/libsvn_client/copy.c
Modified: subversion/branches/ev2-export/subversion/libsvn_client/copy.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_client/copy.c?rev=1325936&r1=1325935&r2=1325936&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_client/copy.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_client/copy.c Fri Apr 13
20:27:50 2012
@@ -633,6 +633,8 @@ drive_single_path(svn_editor_t *editor,
svn_boolean_t do_add = FALSE;
const char *dst_relpath;
+ dst_relpath = svn_uri_skip_ancestor(repos_root, path, scratch_pool);
+
/* If this is a resurrection, we know the source and dest paths are
the same, and that our driver will only be calling us once. */
if (path_info->resurrection)
@@ -648,7 +650,7 @@ drive_single_path(svn_editor_t *editor,
or the destination of the move. */
if (is_move)
{
- if (strcmp(path_info->src_path, path) == 0)
+ if (strcmp(path_info->src_path, dst_relpath) == 0)
do_delete = TRUE;
else
do_add = TRUE;
@@ -660,8 +662,6 @@ drive_single_path(svn_editor_t *editor,
}
}
- dst_relpath = svn_uri_skip_ancestor(repos_root, path, scratch_pool);
-
/* ### We need to handle moves here, rather than just pretend they are
a delete + add. */
if (do_delete)
