zsh-workers
 help / color / mirror / code / Atom feed
From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Subject: [PATCH 4/5] _subversion: resolve: Complete conflicted files created by merges, too
Date: Wed, 26 Jan 2022 14:18:46 +0000	[thread overview]
Message-ID: <20220126141847.10271-4-danielsh@tarpaulin.shahaf.local2> (raw)
In-Reply-To: <20220126141847.10271-1-danielsh@tarpaulin.shahaf.local2>

---
 Completion/Unix/Command/_subversion | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Completion/Unix/Command/_subversion b/Completion/Unix/Command/_subversion
index cb5cbd374..e9a3d9b1a 100644
--- a/Completion/Unix/Command/_subversion
+++ b/Completion/Unix/Command/_subversion
@@ -364,7 +364,11 @@ _svn_uncontrolled() {
 
 (( $+functions[_svn_conflicts] )) ||
 _svn_conflicts() {
-  () { (( $# > 0 )) } $REPLY.(mine|r<->)(NY1)
+  # ### These strings are actually translatable
+  #
+  # The asterisks are to support an optional extension; see
+  # "preserved-conflict-file-exts" in ~/.subversion/config.
+  () { (( $# > 0 )) } $REPLY.(mine|r<->|working*|merge-left*|merge-right*)(NY1)
 }
 
 (( $+functions[_svn_modified] )) ||


  parent reply	other threads:[~2022-01-26 14:35 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-26 14:18 [PATCH 1/5] _subversion: _svn_status: Don't offer unversioned files Daniel Shahaf
2022-01-26 14:18 ` [PATCH 2/5] _subversion: svn rm: Complete all svn-controlled files, not only missing/deleted files Daniel Shahaf
2022-01-26 14:18 ` [PATCH 3/5] _subversion: commit, diff, revert: Update completions for svn 1.7 and newer Daniel Shahaf
2022-01-26 14:18 ` Daniel Shahaf [this message]
2022-01-26 14:18 ` [PATCH 5/5] _subversion: add: Complete target arguments to this subcommand Daniel Shahaf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220126141847.10271-4-danielsh@tarpaulin.shahaf.local2 \
    --to=d.s@daniel.shahaf.name \
    --cc=zsh-workers@zsh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).