Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1703399 -
 /subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
Date: Wed, 16 Sep 2015 13:23:44 -0000
To: commits@subversion.apache.org
From: julianfoad@apache.org
Message-Id: <20150916132344.5A7B8AC022D@hades.apache.org>

Author: julianfoad
Date: Wed Sep 16 13:23:42 2015
New Revision: 1703399

URL: http://svn.apache.org/r1703399
Log:
On the 'move-tracking-2' branch: In the 'svnmover put' command, don't overwrite
an existing file's properties when updating the text.

Not tested, as svnmover currently provides no way to add properties.

* subversion/svnmover/svnmover.c
  (do_put_file): If the element already existed, preserve the original props.

Modified:
    subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c

Modified: subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c?rev=1703399&r1=1703398&r2=1703399&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c (original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Wed Sep 16 13:23:42 2015
@@ -2093,8 +2093,12 @@ do_put_file(svn_editor3_t *editor,
 
   if (file_el_rev->eid >= 0)
     {
-      /* ### get existing props */
-      props = apr_hash_make(scratch_pool);
+      /* get existing props */
+      svn_branch_el_rev_content_t *existing_element
+        = svn_branch_get_element(file_el_rev->branch, file_el_rev->eid);
+
+      SVN_ERR(svn_editor3_payload_resolve(editor, existing_element));
+      props = existing_element->payload->props;
     }
   else
     {