subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1811551 - in /subversion/branches/shelve: subversion/svn/svn.c tools/client-side/bash_completion
Date Mon, 09 Oct 2017 11:09:11 GMT
Author: julianfoad
Date: Mon Oct  9 11:09:11 2017
New Revision: 1811551

URL: http://svn.apache.org/viewvc?rev=1811551&view=rev
Log:
On the 'shelve' branch: Update bash_completion; remove obsolete '-N' option.

Modified:
    subversion/branches/shelve/subversion/svn/svn.c
    subversion/branches/shelve/tools/client-side/bash_completion

Modified: subversion/branches/shelve/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/shelve/subversion/svn/svn.c?rev=1811551&r1=1811550&r2=1811551&view=diff
==============================================================================
--- subversion/branches/shelve/subversion/svn/svn.c (original)
+++ subversion/branches/shelve/subversion/svn/svn.c Mon Oct  9 11:09:11 2017
@@ -1677,7 +1677,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
      "  A shelved change is stored as a patch file, .svn/shelves/NAME.patch\n"
     ),
     {opt_delete, opt_list, 'q', opt_dry_run, opt_keep_local,
-     'N', opt_depth, opt_targets, opt_changelist,
+     opt_depth, opt_targets, opt_changelist,
      /* almost SVN_CL__LOG_MSG_OPTIONS but not currently opt_with_revprop: */
      'm', 'F', opt_force_log, opt_editor_cmd, opt_encoding,
     } },

Modified: subversion/branches/shelve/tools/client-side/bash_completion
URL: http://svn.apache.org/viewvc/subversion/branches/shelve/tools/client-side/bash_completion?rev=1811551&r1=1811550&r2=1811551&view=diff
==============================================================================
--- subversion/branches/shelve/tools/client-side/bash_completion (original)
+++ subversion/branches/shelve/tools/client-side/bash_completion Mon Oct  9 11:09:11 2017
@@ -1023,10 +1023,10 @@ _svn()
 		cmdOpts="$qOpts $pOpts"
 		;;
 	shelve)
-		cmdOpts="$qOpts --delete --list --dry-run $nOpts --targets $cOpts"
+		cmdOpts="$qOpts --keep-local --delete --list $qOpts --dry-run --depth --targets $cOpts"
 		;;
 	unshelve)
-		cmdOpts="$qOpts --keep --dry-run"
+		cmdOpts="$qOpts --keep-shelved --list $qOpts --dry-run"
 		;;
 	shelves)
 		cmdOpts="$qOpts"



Mime
View raw message