subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1821873 - in /subversion/branches/shelve-checkpoint: ./ subversion/libsvn_client/shelve.c subversion/svn/shelve-cmd.c subversion/svn/svn.c
Date Mon, 22 Jan 2018 14:42:13 GMT
Author: julianfoad
Date: Mon Jan 22 14:42:13 2018
New Revision: 1821873

URL: http://svn.apache.org/viewvc?rev=1821873&view=rev
Log:
On the 'shelve-checkpoint' branch: Catch up to trunk@1821869.

Modified:
    subversion/branches/shelve-checkpoint/   (props changed)
    subversion/branches/shelve-checkpoint/subversion/libsvn_client/shelve.c   (props changed)
    subversion/branches/shelve-checkpoint/subversion/svn/shelve-cmd.c   (props changed)
    subversion/branches/shelve-checkpoint/subversion/svn/svn.c

Propchange: subversion/branches/shelve-checkpoint/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 22 14:42:13 2018
@@ -98,4 +98,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1801593-1821863
+/subversion/trunk:1801593-1821869

Propchange: subversion/branches/shelve-checkpoint/subversion/libsvn_client/shelve.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 22 14:42:13 2018
@@ -99,3 +99,4 @@
 /subversion/branches/verify-at-commit/subversion/libsvn_client/shelve.c:1462039-1462408
 /subversion/branches/verify-keep-going/subversion/libsvn_client/shelve.c:1439280-1546110
 /subversion/branches/wc-collate-path/subversion/libsvn_client/shelve.c:1402685-1480384
+/subversion/trunk/subversion/libsvn_client/shelve.c:1815228-1817400

Propchange: subversion/branches/shelve-checkpoint/subversion/svn/shelve-cmd.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 22 14:42:13 2018
@@ -99,3 +99,4 @@
 /subversion/branches/verify-at-commit/subversion/svn/shelve-cmd.c:1462039-1462408
 /subversion/branches/verify-keep-going/subversion/svn/shelve-cmd.c:1439280-1546110
 /subversion/branches/wc-collate-path/subversion/svn/shelve-cmd.c:1402685-1480384
+/subversion/trunk/subversion/svn/shelve-cmd.c:1815228-1816054

Modified: subversion/branches/shelve-checkpoint/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/svn/svn.c?rev=1821873&r1=1821872&r2=1821873&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/subversion/svn/svn.c (original)
+++ subversion/branches/shelve-checkpoint/subversion/svn/svn.c Mon Jan 22 14:42:13 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:



Mime
View raw message