summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_subversion2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b0aca4fd9..8d2cd80db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2018-09-12 Daniel Shahaf <d.s@daniel.shahaf.name>
+ * unposted: Completion/Unix/Command/_subversion: _svn: Complete
+ --accept=recommended, new in 1.10.0.
+
* 43447: Etc/creating-a-release.txt, Makefile.in: Generate
tar.xz artifacts only.
diff --git a/Completion/Unix/Command/_subversion b/Completion/Unix/Command/_subversion
index e16be7e59..d30f2e657 100644
--- a/Completion/Unix/Command/_subversion
+++ b/Completion/Unix/Command/_subversion
@@ -70,7 +70,7 @@ _svn () {
${=${${${(M)${(f)"$(_call_program options svn help $cmd)"#(*Valid options:|(#e))}:#* :*}%% #:*}/ (arg|ARG)/:arg:}/(#b)(-##)([[:alpha:]]##) \[--([a-z-]##)\](:arg:)#/(--$match[3])$match[1]$match[2]$match[4] ($match[1]$match[2])--$match[3]$match[4]}
)
while (( idx=$args[(I)*--accept:arg:] )); do
- args[idx]=( --accept'=:automatic conflict resolution action:((working\:working base\:base '"`for i j in p postpone mc mine-conflict tc theirs-conflict mf mine-full tf theirs-full e edit l launch; do print -rn $i\\\\:$j $j\\\\:$j ""; done `"'))' )
+ args[idx]=( --accept'=:automatic conflict resolution action:((working\:working base\:base recommended\:recommended '"`for i j in p postpone mc mine-conflict tc theirs-conflict mf mine-full tf theirs-full e edit l launch; do print -rn $i\\\\:$j $j\\\\:$j ""; done `"'))' )
done
while (( idx=$args[(I)*--c(l|hangelist):arg:] )); do
args[idx]=( \*{--cl,--changelist}'=:change list:_svn_changelists' )