svn commit: r1560690 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

[rh...@apache.org]

Author: rhuijben
Date: Thu Jan 23 14:13:54 2014
New Revision: 1560690

URL: http://svn.apache.org/r1560690
Log:
* subversion/libsvn_wc/wc_db.c
  (db_op_copy): Properly convert the repository id to copy from when
    performing a wc-wc copy between separate working copy databases.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc_db.c

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1560690&r1=1560689&r2=1560690&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Thu Jan 23 14:13:54 2014
@@ -4648,6 +4648,21 @@ db_op_copy(svn_wc__db_wcroot_t *src_wcro
     }
   else
     {
+      if (copyfrom_relpath)
+        {
+          const char *repos_root_url;
+          const char *repos_uuid;
+
+          /* Pass the right repos-id for the destination db! */
+
+          SVN_ERR(svn_wc__db_fetch_repos_info(&repos_root_url, &repos_uuid,
+                                              src_wcroot->sdb, copyfrom_id,
+                                              scratch_pool));
+
+          SVN_ERR(create_repos_id(&copyfrom_id, repos_root_url, repos_uuid,
+                                  dst_wcroot->sdb, scratch_pool));
+        }
+
       SVN_ERR(cross_db_copy(src_wcroot, src_relpath, dst_wcroot,
                             dst_relpath, dst_presence, dst_op_depth,
                             dst_np_op_depth, kind,