Author: hwright
Date: Mon Oct 15 15:01:33 2012
New Revision: 1398319
URL: http://svn.apache.org/viewvc?rev=1398319&view=rev
Log:
Ev2: Make sure that copyfrom paths in the compat shims are absolute.
* subversion/libsvn_delta/compat.c
(apply_change): When given a relative copyfrom path, make it absolute.
Modified:
subversion/trunk/subversion/libsvn_delta/compat.c
Modified: subversion/trunk/subversion/libsvn_delta/compat.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/compat.c?rev=1398319&r1=1398318&r2=1398319&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/compat.c (original)
+++ subversion/trunk/subversion/libsvn_delta/compat.c Mon Oct 15 15:01:33 2012
@@ -1637,9 +1637,12 @@ apply_change(void **dir_baton,
change->copyfrom_path,
scratch_pool);
else
- /* ### prefix with "/" ? */
copyfrom_url = change->copyfrom_path;
+ /* Make this an FS path by prepending "/" */
+ if (copyfrom_url[0] != '/')
+ copyfrom_url = apr_pstrcat(scratch_pool, "/", copyfrom_url, NULL);
+
copyfrom_rev = change->copyfrom_rev;
}