subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1036429 - /subversion/trunk/subversion/libsvn_repos/replay.c
Date Thu, 18 Nov 2010 12:17:27 GMT
Author: philip
Date: Thu Nov 18 12:17:27 2010
New Revision: 1036429

URL: http://svn.apache.org/viewvc?rev=1036429&view=rev
Log:
Fix svnsync_tests 29 for BDB.  This also fixes the assert in
svnrdump_tests 35 for BDB although the test still fails.

* subversion/libsvn_repos/replay.c
  (add_subdir): Get copyfrom for replaced children if not already known.

Modified:
    subversion/trunk/subversion/libsvn_repos/replay.c

Modified: subversion/trunk/subversion/libsvn_repos/replay.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/replay.c?rev=1036429&r1=1036428&r2=1036429&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/replay.c (original)
+++ subversion/trunk/subversion/libsvn_repos/replay.c Thu Nov 18 12:17:27 2010
@@ -225,8 +225,13 @@ add_subdir(svn_fs_root_t *source_root,
             continue;
           else if (change->change_kind == svn_fs_path_change_replace)
             {
-              /* ### Can this assert fail? */
-              SVN_ERR_ASSERT(change->copyfrom_known);
+              if (! change->copyfrom_known)
+                {
+                  SVN_ERR(svn_fs_copied_from(&change->copyfrom_rev,
+                                             &change->copyfrom_path,
+                                             target_root, new_path, pool));
+                  change->copyfrom_known = TRUE;
+                }
               copyfrom_path = change->copyfrom_path;
               copyfrom_rev = change->copyfrom_rev;
             }



Mime
View raw message