svn commit: r1821869 - /subversion/trunk/subversion/svn/svn.c

[ju...@apache.org]

Author: julianfoad
Date: Mon Jan 22 14:15:28 2018
New Revision: 1821869

URL: http://svn.apache.org/viewvc?rev=1821869&view=rev
Log:
Bring more Shelving-v1 code inside the #ifdef.

* subversion/svn/svn.c
  (svn_cl__longopt_t,
   sub_main): Put the v1-specific options inside the #ifdef.

Modified:
    subversion/trunk/subversion/svn/svn.c

Modified: subversion/trunk/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1821869&r1=1821868&r2=1821869&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Mon Jan 22 14:15:28 2018
@@ -148,9 +148,11 @@ typedef enum svn_cl__longopt_t {
   opt_show_item,
   opt_adds_as_modification,
   opt_vacuum_pristines,
+#ifdef WITH_SHELVE_V1
   opt_delete,
   opt_keep_shelved,
   opt_list
+#endif
 } svn_cl__longopt_t;
 
 
@@ -2426,9 +2428,11 @@ sub_main(int *exit_code, int argc, const
       case opt_dry_run:
         opt_state.dry_run = TRUE;
         break;
+#ifdef WITH_SHELVE_V1
       case opt_list:
         opt_state.list = TRUE;
         break;
+#endif
       case opt_revprop:
         opt_state.revprop = TRUE;
         break;
@@ -2612,7 +2616,9 @@ sub_main(int *exit_code, int argc, const
         opt_state.diff.summarize = TRUE;
         break;
       case opt_remove:
+#ifdef WITH_SHELVE_V1
       case opt_delete:
+#endif
         opt_state.remove = TRUE;
         break;
       case opt_changelist:
@@ -2628,7 +2634,9 @@ sub_main(int *exit_code, int argc, const
         opt_state.keep_changelists = TRUE;
         break;
       case opt_keep_local:
+#ifdef WITH_SHELVE_V1
       case opt_keep_shelved:
+#endif
         opt_state.keep_local = TRUE;
         break;
       case opt_with_all_revprops: