From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 32721 invoked from network); 26 Jan 2022 14:35:02 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 26 Jan 2022 14:35:02 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1643207702; b=dRdfQPPc2Xlh4Okg3UGn1zXcTXIyP0g2PAc/V6H9t+6kkrE9QSrIeRvDtFoer7TfuOPw7zufKm fpdLkI++Fa7Ib9eKLUwvzSea0MTQGq2c+RG2m4jN7BD8w67Iih6CEVHdKAehjyHO3mK0cOn8eJ juvFJXzQB5BV7xmgJzcciIm98BTDyii4MPk5rRUYKgDW2hxjm+MhhhdTPi6U0IUovxJ7N1Hlj5 Lpnv8N9DrJ4EfnfM3+Q/PQonDJzunms9heXF6gNcbfQLcU6Nft4/g71F4PY4ENW1deqriIS0cr MmnGoVI5trvIwD5p+zr5c5bKNo1inveOzmVpLeyTgcfT0A==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (wnew1-smtp.messagingengine.com) smtp.remote-ip=64.147.123.26; dkim=pass header.d=daniel.shahaf.name header.s=fm2 header.a=rsa-sha256; dkim=pass header.d=messagingengine.com header.s=fm1 header.a=rsa-sha256; dmarc=none header.from=daniel.shahaf.name; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1643207702; bh=4aUIyuvOzSlH2mfBewwoEhWv6tBJ2goMB7Ub+xgzKT4=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:To:From:DKIM-Signature:DKIM-Signature: DKIM-Signature; b=ouMR5nRz0LroA20ZhgIH33ZnLFwd0J7QOQ+dyDNNgg8DjBDA+E8xeXj5DsgygGl3wj9nKul0H4 uadq1Q8QL/vjYAyL62Ho3AXJLtWYblIMt3lGAr4PtWpApLfwlyJXiHhmvI6nnEIHoN9ggwzVhv oSU5VNoNxP4IHKO0i2zQV4a7lHZZKNwiX61Wy8neN9gp7DYWcBecJlWcUCDoR15orT2ZHqZhr+ iW/7arON+6hdC7rJy58oE66lEaXSpA3FaXm1BHycvlmqAdzHFEmhthsB276/sj27LfBS/A1fNL QIucDs3WHhh/C73wj6SH0Pu8+JZsiwOmunDHSv9WFqLI3w==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To: Cc:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=4Qu60f0JtQFF70vjuSGK0Ay2+0/+Mj4Q83OFa5Z5rDs=; b=Ymwe60ISjoOCNz48bP2PSASyZp 3pSjafn/+d3f1o8FE5RXFyQyTmo5Tuoa5GJBwcdyr8u8DWYFooFar8pEowjYavYXCRfIvIwz4dKpD MweLOZkRxtnR67VDFX/6o2bqBWWEBxA08kAZn6Qmjo5/QLQoT0xS4jLQ8p0o+EsQhooSRcGBwvSLV UmYc+LrltYIZqxGpJSiJ5cnZq1/KXLgJHkFN6SBj8QlOyjIpZKjYYMa3E2RA84rPr3c3mGRDt8idy hLPndrsW7REw6s/h3F4FVck4xSyq+JxfAq+y1nSbZW867cgnj86Tht7tyHrghC9Zn6AkIoyItu0OI ILjBmSYA==; Received: from authenticated user by zero.zsh.org with local id 1nCjO2-0002rs-Mm; Wed, 26 Jan 2022 14:35:02 +0000 Authentication-Results: zsh.org; iprev=pass (wnew1-smtp.messagingengine.com) smtp.remote-ip=64.147.123.26; dkim=pass header.d=daniel.shahaf.name header.s=fm2 header.a=rsa-sha256; dkim=pass header.d=messagingengine.com header.s=fm1 header.a=rsa-sha256; dmarc=none header.from=daniel.shahaf.name; arc=none Received: from wnew1-smtp.messagingengine.com ([64.147.123.26]:46509) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_256_GCM_SHA384:256) id 1nCj8Y-0000gA-D9; Wed, 26 Jan 2022 14:19:04 +0000 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.west.internal (Postfix) with ESMTP id CF0692B0019A; Wed, 26 Jan 2022 09:19:00 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Wed, 26 Jan 2022 09:19:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= daniel.shahaf.name; h=cc:content-transfer-encoding:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm2; bh=4Qu 60f0JtQFF70vjuSGK0Ay2+0/+Mj4Q83OFa5Z5rDs=; b=BVuEjOQ/t08rh2Kia2U qRVYRqYP2V9sSBWnCdnUPZge6mBEMRFvuRBFFTsgEiADKy2XxrAjduO5PsHbJNfh EFArGP7lBwlEaNrI6Xe56Kg8djw+66xh4XTOXOu6WrwwAESGtpmeCXoT9M79iUOS byN5FF4q3sVcEmN3EwCRNmUCMQ7QCbNVc1EdMbbTfsZHWw/Nl5vzyLQWSQ81ouGc oYi1vOeKR8BifOsgTyNmkgQGNkAiWtTQZQTL7QkBUBstAj99sgfhSvHnNTcq+Kj/ 9H+NFRkdvsiVbY2O6+ofkevIXtOLePcC/2JPen+kNy86DoTqQwdqmpUmblj3sOtr NIQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=4Qu60f 0JtQFF70vjuSGK0Ay2+0/+Mj4Q83OFa5Z5rDs=; b=Y6fl95VE3cJJmeHLvRBcQO 91vPLbXlCp8SIsjNZg/PVllqHRETiQ8eDqWDir9jb3e98Xk4G7dRkFsjX+D6u3CS p3axq+UpMtI6ZJoXee+OWRNkSgKTtdXRXNjK1/qKYHPqZ69hipH45pE7bYLFbQW6 8pSH/F5kDDIH+pHF5Rm+jPYn2pvpHMIka6PMcNNnAPADyzAKDdKBVNq/nGqDCsgE uZi2+HtB+uowbMle8y/LD0b/QAcWjNAD+kAes37rFIHjg6yhUFO+eNxNDjnBn10w PeeMQRNByqkMCwDVDpxjTBhpoarcMk1foy6zqPDVSTo8CnyY2RGFgYxLjU9Py31w == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrfedugdeivdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecuogfvvgigthfqnhhlhidqqdfuphgrmhgsohhtqdgkge dvuddqheduucdlfedttddmnecujfgurhephffvufffkffojghfggfgsedtkedttdertddt necuhfhrohhmpeffrghnihgvlhcuufhhrghhrghfuceougdrshesuggrnhhivghlrdhshh grhhgrfhdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeetgffggfefueejgffgjeejjeel ueejvefhveegledvgeeigeevuefgffejfeelteenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpegurdhssegurghnihgvlhdrshhhrghhrghfrdhn rghmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Wed, 26 Jan 2022 09:19:00 -0500 (EST) Received: by tarpaulin.shahaf.local2 (Postfix, from userid 1000) id 4JkQnZ6xylz4fR; Wed, 26 Jan 2022 14:18:58 +0000 (UTC) From: Daniel Shahaf 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 Message-Id: <20220126141847.10271-4-danielsh@tarpaulin.shahaf.local2> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220126141847.10271-1-danielsh@tarpaulin.shahaf.local2> References: <20220126141847.10271-1-danielsh@tarpaulin.shahaf.local2> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Seq: 49714 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: List-Subscribe: List-Unsubscribe: List-Post: List-Owner: List-Archive: --- 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] )) ||