1 files changed, 4 insertions, 16 deletions

diff --git a/subversion/libsvn_client/diff_summarize.c b/subversion/libsvn_client/diff_summarize.c
index 9e258cd..f4972a3 100644
--- a/subversion/libsvn_client/diff_summarize.c
+++ b/subversion/libsvn_client/diff_summarize.c
@@ -36,11 +36,6 @@
 
 /* Diff callbacks baton.  */
 struct summarize_baton_t {
-  apr_pool_t *baton_pool; /* For allocating skip_path */
-
-  /* The target path of the diff, relative to the anchor; "" if target == anchor. */
-  const char *skip_relpath;
-
   /* The summarize callback passed down from the API */
   svn_client_diff_summarize_func_t summarize_func;
 
@@ -49,9 +44,8 @@ struct summarize_baton_t {
 };
 
 /* Call B->summarize_func with B->summarize_func_baton, passing it a
- * summary object composed from PATH (but made to be relative to the target
- * of the diff), SUMMARIZE_KIND, PROP_CHANGED (or FALSE if the action is an
- * add or delete) and NODE_KIND. */
+ * summary object composed from PATH, SUMMARIZE_KIND, PROP_CHANGED (or
+ * FALSE if the action is an add or delete) and NODE_KIND. */
 static svn_error_t *
 send_summary(struct summarize_baton_t *b,
              const char *path,
@@ -65,9 +59,7 @@ send_summary(struct summarize_baton_t *b,
   SVN_ERR_ASSERT(summarize_kind != svn_client_diff_summarize_kind_normal
                  || prop_changed);
 
-  /* PATH is relative to the anchor of the diff, but SUM->path needs to be
-     relative to the target of the diff. */
-  sum->path = svn_relpath_skip_ancestor(b->skip_relpath, path);
+  sum->path = path;
   sum->summarize_kind = summarize_kind;
   if (summarize_kind == svn_client_diff_summarize_kind_modified
       || summarize_kind == svn_client_diff_summarize_kind_normal)
@@ -265,18 +257,15 @@ diff_file_deleted(const char *relpath,
 
 svn_error_t *
 svn_client__get_diff_summarize_callbacks(
-                        const svn_diff_tree_processor_t **diff_processor,
-                        const char ***p_root_relpath,
+                        svn_diff_tree_processor_t **diff_processor,
                         svn_client_diff_summarize_func_t summarize_func,
                         void *summarize_baton,
-                        const char *original_target,
                         apr_pool_t *result_pool,
                         apr_pool_t *scratch_pool)
 {
   svn_diff_tree_processor_t *dp;
   struct summarize_baton_t *b = apr_pcalloc(result_pool, sizeof(*b));
 
-  b->baton_pool = result_pool;
   b->summarize_func = summarize_func;
   b->summarize_func_baton = summarize_baton;
 
@@ -293,7 +282,6 @@ svn_client__get_diff_summarize_callbacks(
   dp->dir_added = diff_dir_added;
 
   *diff_processor = dp;
-  *p_root_relpath = &b->skip_relpath;
 
   return SVN_NO_ERROR;
 }