svn commit: r1821835 - in /subversion/branches/shelve-checkpoint/subversion: libsvn_client/shelf.c libsvn_client/shelve.c svn/shelf-cmd.c svn/shelve-cmd.c

[julianfoad]

Author: julianfoad
Date: Mon Jan 22 11:14:20 2018
New Revision: 1821835

URL: http://svn.apache.org/viewvc?rev=1821835&view=rev
Log:
On the 'shelve-checkpoint' branch: Rename some files so as not to clash
with the shelving v1 files on trunk.

Also fix a compile error introduced in r1821831.

Added:
    subversion/branches/shelve-checkpoint/subversion/libsvn_client/shelf.c
      - copied unchanged from r1821831, 
subversion/branches/shelve-checkpoint/subversion/libsvn_client/shelve.c
    subversion/branches/shelve-checkpoint/subversion/svn/shelf-cmd.c
      - copied, changed from r1821831, 
subversion/branches/shelve-checkpoint/subversion/svn/shelve-cmd.c
Removed:
    subversion/branches/shelve-checkpoint/subversion/libsvn_client/shelve.c
    subversion/branches/shelve-checkpoint/subversion/svn/shelve-cmd.c

Copied: subversion/branches/shelve-checkpoint/subversion/svn/shelf-cmd.c (from 
r1821831, subversion/branches/shelve-checkpoint/subversion/svn/shelve-cmd.c)
URL: 
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/svn/shelf-cmd.c?p2=subversion/branches/shelve-checkpoint/subversion/svn/shelf-cmd.c&p1=subversion/branches/shelve-checkpoint/subversion/svn/shelve-cmd.c&r1=1821831&r2=1821835&rev=1821835&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/subversion/svn/shelve-cmd.c (original)
+++ subversion/branches/shelve-checkpoint/subversion/svn/shelf-cmd.c Mon Jan 22 
11:14:20 2018
@@ -728,7 +728,7 @@ svn_cl__shelf_save(apr_getopt_t *os,
   svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state;
 
   opt_state->keep_local = TRUE;
-  SVN_ERR(svn_cl__shelve(os, baton, pool));
+  SVN_ERR(svn_cl__shelf_shelve(os, baton, pool));
   return SVN_NO_ERROR;
 }