Author: julianfoad
Date: Wed Mar 18 09:08:36 2015
New Revision: 1667473
URL: http://svn.apache.org/r1667473
Log:
On the 'move-tracking-2' branch: Fix a compilation error (manifested on
Windows).
Found by: jcorvel
* subversion/libsvn_delta/compat3p.c
(process_actions): Avoid using #if within the arguments of SVN_ERR macro.
Modified:
subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3p.c
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3p.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3p.c?rev=1667473&r1=1667472&r2=1667473&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3p.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3p.c Wed
Mar 18 09:08:36 2015
@@ -774,13 +774,15 @@ process_actions(struct ev3_edit_baton *e
if (change->copyfrom_path != NULL)
{
- SVN_ERR(svn_editor3p_cp(eb->editor,
#ifdef SVN_EDITOR3_WITH_COPY_FROM_THIS_REV
+ SVN_ERR(svn_editor3p_cp(eb->editor,
txn_path(change->copyfrom_path,
change->copyfrom_rev, ""),
+ parent_loc, repos_relpath_basename));
#else
+ SVN_ERR(svn_editor3p_cp(eb->editor,
pathrev(change->copyfrom_path,
change->copyfrom_rev),
-#endif
parent_loc, repos_relpath_basename));
+#endif
/* Fall through to possibly make changes post-copy. */
}
else
