subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1711049 - /subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
Date Wed, 28 Oct 2015 16:37:59 GMT
Author: julianfoad
Date: Wed Oct 28 16:37:59 2015
New Revision: 1711049

URL: http://svn.apache.org/viewvc?rev=1711049&view=rev
Log:
On the 'move-tracking-2' branch: Fix assumptions about EIDs.

* subversion/svnmover/svnmover.c
  (show_subtree_diff,
   do_put_file): Allow negative EIDs.

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

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=1711049&r1=1711048&r2=1711049&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c (original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Wed Oct 28 16:37:59
2015
@@ -1471,8 +1471,8 @@ show_subtree_diff(svn_branch_subtree_t *
   apr_hash_t *diff_changes;
   SVN_ITER_T(diff_item_t) *ai;
 
-  SVN_ERR_ASSERT(left && left->tree->root_eid >= 0
-                 && right && right->tree->root_eid >= 0);
+  SVN_ERR_ASSERT(left && left->tree->root_eid != -1
+                 && right && right->tree->root_eid != -1);
 
   SVN_ERR(subtree_diff(&diff_changes, left, right,
                        scratch_pool, scratch_pool));
@@ -1783,7 +1783,7 @@ do_put_file(svn_branch_txn_t *txn,
   const char *name;
   svn_element_payload_t *payload;
 
-  if (file_el_rev->eid >= 0)
+  if (file_el_rev->eid != -1)
     {
       /* get existing props */
       svn_element_content_t *existing_element
@@ -1821,7 +1821,7 @@ do_put_file(svn_branch_txn_t *txn,
       name = file_name;
     }
 
-  if (file_el_rev->eid >= 0)
+  if (file_el_rev->eid != -1)
     {
       SVN_ERR(svn_branch_state_alter_one(file_el_rev->branch, file_el_rev->eid,
                                          parent_eid, name, payload,



Mime
View raw message