svn commit: r1442557 - /subversion/trunk/subversion/libsvn_client/merge.c

[rh...@apache.org]

Author: rhuijben
Date: Tue Feb  5 12:07:54 2013
New Revision: 1442557

URL: http://svn.apache.org/viewvc?rev=1442557&view=rev
Log:
* subversion/libsvn_client/merge.c
  (do_directory_merge): Following up on r1442556, fix compilation after
    last second before commit edit.

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

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1442557&r1=1442556&r2=1442557&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Feb  5 12:07:54 2013
@@ -9166,9 +9166,9 @@ do_directory_merge(svn_mergeinfo_catalog
                    apr_pool_t *scratch_pool)
 {
   apr_array_header_t *children_with_mergeinfo;
+  svn_error_t *err;
   /* Note that this is not a single-file merge. */
   merge_b->is_single_file_merge = FALSE;
-  svn_error_t *err;
 
   /* Initialize CHILDREN_WITH_MERGEINFO. See the comment
      'THE CHILDREN_WITH_MERGEINFO ARRAY' at the start of this file. */
@@ -9193,7 +9193,7 @@ do_directory_merge(svn_mergeinfo_catalog
                                          target_abspath,
                                          children_with_mergeinfo,
                                          processor, depth,
-                                         merge_b, scratch_pool));
+                                         merge_b, scratch_pool);
 
   merge_b->children_with_mergeinfo = NULL;