svn commit: r1437587 - in /subversion/trunk/subversion/libsvn_client: copy.c copy_foreign.c

[rh...@apache.org]

Author: rhuijben
Date: Wed Jan 23 17:25:51 2013
New Revision: 1437587

URL: http://svn.apache.org/viewvc?rev=1437587&view=rev
Log:
Following up on r1437203, make sure we don't copy svn:mergeinfo from
foreign repositories.

* subversion/libsvn_client/copy.c
  (repos_to_wc_copy_single): Drop svn:mergeinfo for foreign copies.

* subversion/libsvn_client/copy_foreign.c
  (dir_change_prop,
   file_change_prop,
   svn_client__copy_foreign): Drop svn:mergeinfo.

Modified:
    subversion/trunk/subversion/libsvn_client/copy.c
    subversion/trunk/subversion/libsvn_client/copy_foreign.c

Modified: subversion/trunk/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1437587&r1=1437586&r2=1437587&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Wed Jan 23 17:25:51 2013
@@ -1658,6 +1658,10 @@ repos_to_wc_copy_single(svn_client__copy
       SVN_ERR(svn_ra_get_file(ra_session, src_rel, pair->src_revnum,
                               new_base_contents,
                               &pair->src_revnum, &new_props, pool));
+
+      if (new_props && ! same_repositories)
+        apr_hash_set(new_props, SVN_PROP_MERGEINFO, APR_HASH_KEY_STRING, NULL);
+
       SVN_ERR(svn_wc_add_repos_file4(
          ctx->wc_ctx, dst_abspath,
          new_base_contents, NULL, new_props, NULL,

Modified: subversion/trunk/subversion/libsvn_client/copy_foreign.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy_foreign.c?rev=1437587&r1=1437586&r2=1437587&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy_foreign.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy_foreign.c Wed Jan 23 17:25:51 2013
@@ -149,9 +149,10 @@ dir_change_prop(void *dir_baton,
 
   prop_kind = svn_property_kind2(name);
 
-  if (prop_kind != svn_prop_regular_kind)
+  if (prop_kind != svn_prop_regular_kind
+      || ! strcmp(name, SVN_PROP_MERGEINFO))
     {
-      /* We can't handle DAV and ENTRY props here */
+      /* We can't handle DAV, ENTRY and merge specific props here */
       return SVN_NO_ERROR;
     }
 
@@ -297,9 +298,10 @@ file_change_prop(void *file_baton,
 
   prop_kind = svn_property_kind2(name);
 
-  if (prop_kind != svn_prop_regular_kind)
+  if (prop_kind != svn_prop_regular_kind
+      || ! strcmp(name, SVN_PROP_MERGEINFO))
     {
-      /* We can't handle DAV and ENTRY props here */
+      /* We can't handle DAV, ENTRY and merge specific props here */
       return SVN_NO_ERROR;
     }
 
@@ -532,9 +534,10 @@ svn_client__copy_foreign(const char *url
           {
             const char *name = svn__apr_hash_index_key(hi);
 
-            if (svn_property_kind2(name) != svn_prop_regular_kind)
+            if (svn_property_kind2(name) != svn_prop_regular_kind
+                || ! strcmp(name, SVN_PROP_MERGEINFO))
               {
-                /* We can't handle DAV and ENTRY props here */
+                /* We can't handle DAV, ENTRY and merge specific props here */
                 apr_hash_set(props, name, APR_HASH_KEY_STRING, NULL);
               }
           }