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

[rh...@apache.org]

Author: rhuijben
Date: Sat Dec 22 23:24:42 2012
New Revision: 1425370

URL: http://svn.apache.org/viewvc?rev=1425370&view=rev
Log:
* subversion/libsvn_client/merge.c
  (dry_run_added_parent_p):
     Resolve a warning, by using the result type of svn_path_component_count.

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=1425370&r1=1425369&r2=1425370&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Sat Dec 22 23:24:42 2012
@@ -521,7 +521,7 @@ dry_run_added_parent_p(const merge_cmd_b
                        apr_pool_t *scratch_pool)
 {
   const char *abspath = local_abspath;
-  int i;
+  apr_size_t i;
 
   if (!merge_b->dry_run)
     return FALSE;