Author: hwright
Date: Fri Apr 13 01:18:55 2012
New Revision: 1325584
URL: http://svn.apache.org/viewvc?rev=1325584&view=rev
Log:
On the ev2-export branch:
Fix compilation conflicts introduced in the catchup merge in r1325565. There
are still test failures, to be fixed in a subsequent commit.
Modified:
subversion/branches/ev2-export/subversion/include/svn_delta.h
subversion/branches/ev2-export/subversion/libsvn_client/export.c
subversion/branches/ev2-export/subversion/libsvn_ra/ra_loader.c
Modified: subversion/branches/ev2-export/subversion/include/svn_delta.h
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/include/svn_delta.h?rev=1325584&r1=1325583&r2=1325584&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/include/svn_delta.h (original)
+++ subversion/branches/ev2-export/subversion/include/svn_delta.h Fri Apr 13
01:18:55 2012
@@ -1184,6 +1184,8 @@ svn_delta__editor_from_delta(svn_editor_
const svn_delta_editor_t *deditor,
void *dedit_baton,
svn_boolean_t *send_abs_paths,
+ const char *repos_root,
+ const char *base_relpath,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_delta_fetch_kind_func_t fetch_kind_func,
@@ -1201,6 +1203,8 @@ svn_delta__delta_from_editor(const svn_d
svn_delta_unlock_func_t unlock_func,
void *unlock_baton,
svn_boolean_t *found_abs_paths,
+ const char *repos_root,
+ const char *base_relpath,
svn_delta_fetch_props_func_t fetch_props_func,
void *fetch_props_baton,
svn_delta_fetch_base_func_t fetch_base_func,
Modified: subversion/branches/ev2-export/subversion/libsvn_client/export.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_client/export.c?rev=1325584&r1=1325583&r2=1325584&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_client/export.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_client/export.c Fri Apr 13
01:18:55 2012
@@ -909,6 +909,7 @@ get_editor(const svn_delta_editor_t **ex
SVN_ERR(svn_delta__delta_from_editor(export_editor, edit_baton,
editor, NULL, NULL, found_abs_paths,
+ NULL, NULL,
fetch_props_func, eb,
fetch_base_func, eb,
exb, result_pool));
Modified: subversion/branches/ev2-export/subversion/libsvn_ra/ra_loader.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_ra/ra_loader.c?rev=1325584&r1=1325583&r2=1325584&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_ra/ra_loader.c Fri Apr 13
01:18:55 2012
@@ -773,6 +773,7 @@ svn_ra_get_commit_editor4(svn_ra_session
SVN_ERR(svn_delta__editor_from_delta(editor, &exb,
&unlock_func, &unlock_baton,
deditor, dedit_baton, &send_abs_paths,
+ NULL, NULL,
cancel_func, cancel_baton,
session->shim_callbacks->fetch_kind_func,
session->shim_callbacks->fetch_baton,
