subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r917950 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Tue, 02 Mar 2010 10:46:47 GMT
Author: philip
Date: Tue Mar  2 10:46:46 2010
New Revision: 917950

URL: http://svn.apache.org/viewvc?rev=917950&view=rev
Log:
* subversion/libsvn_client/merge.c (log_find_operative_revs): Use %ld
   rather than %d to format svn_revnum_t.

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=917950&r1=917949&r2=917950&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Mar  2 10:46:46 2010
@@ -8705,7 +8705,8 @@
                                          rel_path, pool);
 
       SVN_ERR(svn_mergeinfo_parse(&log_entry_as_mergeinfo,
-                                  apr_psprintf(pool, "%s:%d", path, revision),
+                                  apr_psprintf(pool, "%s:%ld",
+                                               path, revision),
                                   pool));
 
       SVN_ERR(mergeinfo_in_catalog(&in_catalog, &subtree_missing_this_rev,
@@ -8739,7 +8740,8 @@
             }
 
           SVN_ERR(svn_mergeinfo_parse(&log_entry_as_mergeinfo,
-                                      apr_psprintf(pool, "%s:%d", missing_path, revision),
+                                      apr_psprintf(pool, "%s:%ld",
+                                                   missing_path, revision),
                                       log_baton->result_pool));
           unmerged_for_key = apr_hash_get(log_baton->unmerged_catalog,
                                           subtree_missing_this_rev,



Mime
View raw message