svn commit: r1829271 - /subversion/branches/shelve-checkpoint/subversion/libsvn_client/prop_commands.c

[julianfoad]

Author: julianfoad
Date: Mon Apr 16 13:19:15 2018
New Revision: 1829271

URL: http://svn.apache.org/viewvc?rev=1829271&view=rev
Log:
On the 'shelve-checkpoint' branch: resolve conflicts.

Modified:
    
subversion/branches/shelve-checkpoint/subversion/libsvn_client/prop_commands.c

Modified: 
subversion/branches/shelve-checkpoint/subversion/libsvn_client/prop_commands.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/libsvn_client/prop_commands.c?rev=1829271&r1=1829270&r2=1829271&view=diff
==============================================================================
--- 
subversion/branches/shelve-checkpoint/subversion/libsvn_client/prop_commands.c 
(original)
+++ 
subversion/branches/shelve-checkpoint/subversion/libsvn_client/prop_commands.c 
Mon Apr 16 13:19:15 2018
@@ -480,9 +480,9 @@ svn_client_revprop_set2(const char *prop
     {
       svn_client_shelf_t *shelf;
 
-      SVN_ERR(svn_client_shelf_open(&shelf, revision->value.shelf,
-                                    URL, ctx, pool));
-      SVN_ERR(svn_client__shelf_revprop_set(shelf, propname, propval, pool));
+      SVN_ERR(svn_client_shelf_open_existing(&shelf, revision->value.shelf,
+                                             URL, ctx, pool));
+      SVN_ERR(svn_client_shelf_revprop_set(shelf, propname, propval, pool));
       SVN_ERR(svn_client_shelf_close(shelf, pool));
       *set_rev = SVN_INVALID_REVNUM;
       return SVN_NO_ERROR;
@@ -992,9 +992,9 @@ svn_client_revprop_get(const char *propn
     {
       svn_client_shelf_t *shelf;
 
-      SVN_ERR(svn_client_shelf_open(&shelf, revision->value.shelf,
-                                    URL, ctx, pool));
-      SVN_ERR(svn_client__shelf_revprop_get(propval, shelf, propname, pool));
+      SVN_ERR(svn_client_shelf_open_existing(&shelf, revision->value.shelf,
+                                             URL, ctx, pool));
+      SVN_ERR(svn_client_shelf_revprop_get(propval, shelf, propname, pool));
       SVN_ERR(svn_client_shelf_close(shelf, pool));
       *set_rev = SVN_INVALID_REVNUM;
       return SVN_NO_ERROR;
@@ -1582,9 +1582,9 @@ svn_client_revprop_list(apr_hash_t **pro
     {
       svn_client_shelf_t *shelf;
 
-      SVN_ERR(svn_client_shelf_open(&shelf, revision->value.shelf,
-                                    URL, ctx, pool));
-      SVN_ERR(svn_client__shelf_revprop_list(props, shelf, pool));
+      SVN_ERR(svn_client_shelf_open_existing(&shelf, revision->value.shelf,
+                                             URL, ctx, pool));
+      SVN_ERR(svn_client_shelf_revprop_list(props, shelf, pool));
       SVN_ERR(svn_client_shelf_close(shelf, pool));
       *set_rev = SVN_INVALID_REVNUM;
       return SVN_NO_ERROR;