svn commit: r1134305 - /subversion/trunk/subversion/libsvn_client/mergeinfo.c

[rhuijben]

Author: rhuijben
Date: Fri Jun 10 13:07:20 2011
New Revision: 1134305

URL: http://svn.apache.org/viewvc?rev=1134305&view=rev
Log:
* subversion/libsvn_client/mergeinfo.c
  (elide_mergeinfo): Fix tests broken by r1134296, by removing an argument
    that wasn't documented to be NULL, but was always NULL.
  (svn_client__elide_mergeinfo): Update caller.

Modified:
    subversion/trunk/subversion/libsvn_client/mergeinfo.c

Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=1134305&r1=1134304&r2=1134305&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Fri Jun 10 13:07:20 
2011
@@ -839,7 +839,6 @@ static svn_error_t *
 elide_mergeinfo(svn_mergeinfo_t parent_mergeinfo,
                 svn_mergeinfo_t child_mergeinfo,
                 const char *local_abspath,
-                const char *path_suffix,
                 svn_client_ctx_t *ctx,
                 apr_pool_t *scratch_pool)
 {
@@ -848,8 +847,8 @@ elide_mergeinfo(svn_mergeinfo_t parent_m
   SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
 
   SVN_ERR(should_elide_mergeinfo(&elides,
-                                 parent_mergeinfo, child_mergeinfo,
-                                 path_suffix, scratch_pool));
+                                 parent_mergeinfo, child_mergeinfo, NULL,
+                                 scratch_pool));
 
   if (elides)
     {
@@ -861,16 +860,18 @@ elide_mergeinfo(svn_mergeinfo_t parent_m
 
       if (ctx->notify_func2)
         {
-          const char *path = svn_dirent_join(local_abspath, path_suffix,
-                                             scratch_pool);
-          svn_wc_notify_t *notify =
-                svn_wc_create_notify(path, svn_wc_notify_merge_elide_info,
-                                     scratch_pool);
+          svn_wc_notify_t *notify;
 
+          notify = svn_wc_create_notify(local_abspath,
+                                        svn_wc_notify_merge_elide_info,
+                                        scratch_pool);
           ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool);
-          notify = svn_wc_create_notify(path, svn_wc_notify_update_update,
+
+          notify = svn_wc_create_notify(local_abspath,
+                                        svn_wc_notify_update_update,
                                         scratch_pool);
           notify->prop_state = svn_wc_notify_state_changed;
+
           ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool);
         }
     }
@@ -982,7 +983,7 @@ svn_client__elide_mergeinfo(const char *
         return SVN_NO_ERROR;
 
       SVN_ERR(elide_mergeinfo(mergeinfo, target_mergeinfo, target_abspath,
-                              NULL, ctx, pool));
+                              ctx, pool));
     }
   return SVN_NO_ERROR;
 }