subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1654020 - /subversion/branches/pin-externals/subversion/libsvn_client/copy.c
Date Thu, 22 Jan 2015 19:21:58 GMT
Author: stsp
Date: Thu Jan 22 19:21:58 2015
New Revision: 1654020

URL: http://svn.apache.org/r1654020
Log:
On the pin-externals branch, properly commit svn:externals property
mods to copied-along children during wc->repos copies.

* subversion/libsvn_client/copy.c
  (queue_prop_change_commit_items): Don't forget about pushing newly created
   commit items onto the commit items list. Fix docstring while here.

Modified:
    subversion/branches/pin-externals/subversion/libsvn_client/copy.c

Modified: subversion/branches/pin-externals/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/libsvn_client/copy.c?rev=1654020&r1=1654019&r2=1654020&view=diff
==============================================================================
--- subversion/branches/pin-externals/subversion/libsvn_client/copy.c (original)
+++ subversion/branches/pin-externals/subversion/libsvn_client/copy.c Thu Jan 22 19:21:58
2015
@@ -1626,7 +1626,7 @@ check_url_kind(void *baton,
   return SVN_NO_ERROR;
 }
 
-/* Queue a property change to LOCAL_ABSPATH in the COMMIT_ITEMS list.
+/* Queue a property change to COMMIT_URL in the COMMIT_ITEMS list.
  * If the list does not already have a commit item for LOCAL_ABSPATH
  * add a new commit item for the property change.
  * Allocate results in RESULT_POOL.
@@ -1664,6 +1664,7 @@ queue_prop_change_commit_items(const cha
       item->url = commit_url;
       item->kind = svn_node_dir;
       item->state_flags = SVN_CLIENT_COMMIT_ITEM_PROP_MODS;
+      APR_ARRAY_PUSH(commit_items, svn_client_commit_item3_t *) = item;
     }
   else
     item->state_flags |= SVN_CLIENT_COMMIT_ITEM_PROP_MODS;
@@ -1672,7 +1673,7 @@ queue_prop_change_commit_items(const cha
     item->outgoing_prop_changes = apr_array_make(result_pool, 1,
                                                  sizeof(svn_prop_t *));
 
-  SVN_DBG(("item->url=%s item->state_flags=0x%x", item->url, item->state_flags));
+  SVN_DBG(("%s: item->url=%s item->state_flags=0x%x propval=%s", __func__, item->url,
item->state_flags, propval->data));
   prop = apr_palloc(result_pool, sizeof(*prop));
   prop->name = propname;
   prop->value = propval;



Mime
View raw message