subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1623990 - in /subversion/branches/log-message-templates: ./ subversion/libsvn_client/copy.c subversion/libsvn_client/mtcc.c subversion/libsvn_client/util.c
Date Wed, 10 Sep 2014 13:06:06 GMT
Author: stsp
Date: Wed Sep 10 13:06:06 2014
New Revision: 1623990

URL: http://svn.apache.org/r1623990
Log:
On the log-message-templates branch, merge from trunk.

Modified:
    subversion/branches/log-message-templates/   (props changed)
    subversion/branches/log-message-templates/subversion/libsvn_client/copy.c
    subversion/branches/log-message-templates/subversion/libsvn_client/mtcc.c
    subversion/branches/log-message-templates/subversion/libsvn_client/util.c

Propchange: subversion/branches/log-message-templates/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1623975-1623989

Modified: subversion/branches/log-message-templates/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/branches/log-message-templates/subversion/libsvn_client/copy.c?rev=1623990&r1=1623989&r2=1623990&view=diff
==============================================================================
--- subversion/branches/log-message-templates/subversion/libsvn_client/copy.c (original)
+++ subversion/branches/log-message-templates/subversion/libsvn_client/copy.c Wed Sep 10 13:06:06
2014
@@ -1101,12 +1101,15 @@ repos_to_repos_copy(const apr_array_head
           item = svn_client_commit_item3_create(pool);
           item->url = svn_path_url_add_component2(top_url, info->dst_path,
                                                   pool);
-          item->state_flags = SVN_CLIENT_COMMIT_ITEM_ADD;
+          item->state_flags = SVN_CLIENT_COMMIT_ITEM_ADD
+                              | SVN_CLIENT_COMMIT_ITEM_IS_COPY;
+          item->copyfrom_url = info->src_url;
+          item->copyfrom_rev = info->src_revnum;
           APR_ARRAY_PUSH(commit_items, svn_client_commit_item3_t *) = item;
 
           if (is_move && (! info->resurrection))
             {
-              item = apr_pcalloc(pool, sizeof(*item));
+              item = svn_client_commit_item3_create(pool);
               item->url = svn_path_url_add_component2(top_url, info->src_path,
                                                       pool);
               item->state_flags = SVN_CLIENT_COMMIT_ITEM_DELETE;

Modified: subversion/branches/log-message-templates/subversion/libsvn_client/mtcc.c
URL: http://svn.apache.org/viewvc/subversion/branches/log-message-templates/subversion/libsvn_client/mtcc.c?rev=1623990&r1=1623989&r2=1623990&view=diff
==============================================================================
--- subversion/branches/log-message-templates/subversion/libsvn_client/mtcc.c (original)
+++ subversion/branches/log-message-templates/subversion/libsvn_client/mtcc.c Wed Sep 10 13:06:06
2014
@@ -1250,6 +1250,7 @@ add_commit_items(mtcc_op_t *op,
                                                            op->src_relpath,
                                                            result_pool);
           item->copyfrom_rev = op->src_rev;
+          item->state_flags |= SVN_CLIENT_COMMIT_ITEM_IS_COPY;
         }
       else
         item->copyfrom_rev = SVN_INVALID_REVNUM;

Modified: subversion/branches/log-message-templates/subversion/libsvn_client/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/log-message-templates/subversion/libsvn_client/util.c?rev=1623990&r1=1623989&r2=1623990&view=diff
==============================================================================
--- subversion/branches/log-message-templates/subversion/libsvn_client/util.c (original)
+++ subversion/branches/log-message-templates/subversion/libsvn_client/util.c Wed Sep 10 13:06:06
2014
@@ -138,7 +138,12 @@ svn_client__pathrev_fspath(const svn_cli
 svn_client_commit_item3_t *
 svn_client_commit_item3_create(apr_pool_t *pool)
 {
-  return apr_pcalloc(pool, sizeof(svn_client_commit_item3_t));
+  svn_client_commit_item3_t *item = apr_pcalloc(pool, sizeof(*item));
+
+  item->revision = SVN_INVALID_REVNUM;
+  item->copyfrom_rev = SVN_INVALID_REVNUM;
+
+  return item;
 }
 
 svn_client_commit_item3_t *



Mime
View raw message