subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1712538 - /subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
Date Wed, 04 Nov 2015 11:50:52 GMT
Author: julianfoad
Date: Wed Nov  4 11:50:52 2015
New Revision: 1712538

URL: http://svn.apache.org/viewvc?rev=1712538&view=rev
Log:
On the 'move-tracking-2' branch: A follow-up to r1712362.

* subversion/libsvn_delta/branch.c
  (svn_branch_state_serialize): Require a 'flat' state; don't flatten.

Modified:
    subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.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=1712538&r1=1712537&r2=1712538&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Wed Nov  4 11:50:52
2015
@@ -1557,6 +1557,8 @@ svn_branch_state_serialize(svn_stream_t
   SVN_ITER_T(svn_element_content_t) *hi;
   const char *predecessor_str = "";
 
+  SVN_ERR_ASSERT(branch->priv->is_flat);
+
   if (branch->predecessor)
     {
       assert(SVN_IS_VALID_REVNUM(branch->predecessor->rev));
@@ -1572,10 +1574,6 @@ svn_branch_state_serialize(svn_stream_t
                             apr_hash_count(branch->priv->element_tree->e_map),
                             predecessor_str));
 
-  svn_element_tree_purge_orphans(branch->priv->element_tree->e_map,
-                                 branch->priv->element_tree->root_eid,
-                                 scratch_pool);
-
   for (SVN_HASH_ITER_SORTED(hi, branch->priv->element_tree->e_map,
                             sort_compare_items_by_eid, scratch_pool))
     {



Mime
View raw message