subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1664441 - in /subversion/branches/move-tracking-2/subversion: libsvn_delta/branch.c svnmover/svnmover.c
Date Thu, 05 Mar 2015 18:10:33 GMT
Author: julianfoad
Date: Thu Mar  5 18:10:33 2015
New Revision: 1664441

URL: http://svn.apache.org/r1664441
Log:
On the 'move-tracking-2' branch: Add casts where converting revnums to 'int',
to make a nice clean build.

Found by: brane

* subversion/libsvn_delta/branch.c
  (svn_branch_repos_find_el_rev_by_path_rev): Add a cast.

* subversion/svnmover/svnmover.c
  (svn_branch_find_predecessor_el_rev): Add a cast.

Modified:
    subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
    subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c

Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c?rev=1664441&r1=1664440&r2=1664441&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Thu Mar  5 18:10:33
2015
@@ -1346,7 +1346,7 @@ svn_branch_repos_find_el_rev_by_path_rev
     return svn_error_createf(SVN_ERR_FS_NO_SUCH_REVISION, NULL,
                              _("No such revision %ld"), revnum);
 
-  rev_root = svn_array_get(repos->rev_roots, revnum);
+  rev_root = svn_array_get(repos->rev_roots, (int)(revnum));
   el_rev->rev = revnum;
   svn_branch_find_nested_branch_element_by_rrpath(&el_rev->branch, &el_rev->eid,
                                                   rev_root->root_branch, rrpath,

Modified: subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c?rev=1664441&r1=1664440&r2=1664441&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c (original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Thu Mar  5 18:10:33
2015
@@ -1332,7 +1332,7 @@ svn_branch_find_predecessor_el_rev(svn_b
     return NULL;
 
   branch_id = svn_branch_instance_get_id(old_el_rev->branch, result_pool);
-  rev_root = svn_array_get(repos->rev_roots, old_el_rev->rev - 1);
+  rev_root = svn_array_get(repos->rev_roots, (int)(old_el_rev->rev - 1));
   branch = svn_branch_revision_root_find_branch_by_id(rev_root, branch_id,
                                                       result_pool);
 



Mime
View raw message