From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#66211: 30.0.50; C-x v v in vc-diff does not work with lesser versionf of patch Date: Tue, 26 Sep 2023 16:38:28 +0300 Message-ID: <9ea150f8-eb57-b44a-146b-ea6addf26cfc@gutov.dev> References: <3e17d007-0c22-918d-2030-89b02b081d44@gutov.dev> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11553"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Cc: 66211@debbugs.gnu.org To: "Alfred M. Szmidt" Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Sep 26 15:39:11 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ql8HO-0002l5-Sl for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 26 Sep 2023 15:39:11 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ql8H5-0006eD-EX; Tue, 26 Sep 2023 09:38:51 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ql8H3-0006di-Hf for bug-gnu-emacs@gnu.org; Tue, 26 Sep 2023 09:38:49 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ql8H3-0005c6-6M for bug-gnu-emacs@gnu.org; Tue, 26 Sep 2023 09:38:49 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ql8HG-0004nZ-4Z for bug-gnu-emacs@gnu.org; Tue, 26 Sep 2023 09:39:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 26 Sep 2023 13:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66211 X-GNU-PR-Package: emacs Original-Received: via spool by 66211-submit@debbugs.gnu.org id=B66211.169573553518433 (code B ref 66211); Tue, 26 Sep 2023 13:39:02 +0000 Original-Received: (at 66211) by debbugs.gnu.org; 26 Sep 2023 13:38:55 +0000 Original-Received: from localhost ([127.0.0.1]:47627 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ql8H9-0004nD-2W for submit@debbugs.gnu.org; Tue, 26 Sep 2023 09:38:55 -0400 Original-Received: from out3-smtp.messagingengine.com ([66.111.4.27]:44677) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ql8H4-0004mw-KC for 66211@debbugs.gnu.org; Tue, 26 Sep 2023 09:38:52 -0400 Original-Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 435B45C25FF; Tue, 26 Sep 2023 09:38:31 -0400 (EDT) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Tue, 26 Sep 2023 09:38:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm1; t= 1695735511; x=1695821911; bh=uRrr2fxgg6KhziNBi/sxo56jUKWDNHNqWny Sm4Tp3qo=; b=xUCyz6Z2Fy1p1FVryjK/m7BMZQD2OrMYz+XaxnBiiJKjHvRNKGl 6/lRjoJ/OYo1l2Kh5flab5bw0fk9Ju585j4IOoSGw4OFh93O7mU7GfhIOgLII/AD 0l8uP4wInXDverGvDo0Z2xSz1ZvloK/7d3DLY5TtqINYU0bbGlaHRN+Df9yQyx/l 4YubG9FKBu7RGZviYwCRP06QMMK/ltkR+6fgpF4jYNmGFi618CGLD+nRPK3SUh36 qMt3nWxuflT+XmHkGWHYlDJPtJrE5srpl0HVM+mI0eFvKSgyuwKjm2n3GfUCEH33 rb8+NE4z8+fmrJFoMIMpHls+h89/+97ichQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :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=fm2; t= 1695735511; x=1695821911; bh=uRrr2fxgg6KhziNBi/sxo56jUKWDNHNqWny Sm4Tp3qo=; b=eeJIu9IiZQlzftnJFIJlWzO0ZxXOnA+d4BI96Z7Io49XLsflvP+ ngl6IsWtZ6J/rti0k0h97dPoWPbpx5OBK39AT4Iy7C1yIRnkPCLrDgpv5dGxaRBH CJEEsLZbIaPBw5KbFOC6/BUd/zQqb1Ie7VGZT2hNo9DNiNWE9vHl1hYUAsWS2Hwf Gr+Dad9ZutFPjGOUafyEY9fCCVw4y2Y3M6Pw6ToblI6wS//hdwBssIGc9gg2aT4c vxiNVYEpxhgZ+AGkegddWXojtpzreLqI/2968Fl5LaoEz60i7fB1578GCzaB4kYR mD32Kv8ZGmtddpLVNkqMsyRLVxWqQgQXSCg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvjedrtddtgdefjecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepkfffgggfuffvvehfhfgjtgfgsehtje ertddtfeejnecuhfhrohhmpeffmhhithhrhicuifhuthhovhcuoegumhhithhrhiesghhu thhovhdruggvvheqnecuggftrfgrthhtvghrnhepiefgteevheevveffheeltdeukeeiie ekueefgedugfefgefhudelgfefveelvdevnecuvehluhhsthgvrhfuihiivgeptdenucfr rghrrghmpehmrghilhhfrhhomhepughmihhtrhihsehguhhtohhvrdguvghv X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 26 Sep 2023 09:38:30 -0400 (EDT) Content-Language: en-US In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:271377 Archived-At: On 26/09/2023 15:43, Alfred M. Szmidt wrote: > > The C-x v v command in a*vc-diff* buffer does not work if you have a > > lesser version of patch, e.g., the one on OpenBSD: > > > > user-error: Patch failed: patch: unknown option -- no-backup-if-mismatch > > usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory] > > [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count] > > [-r rej-name] [-V t | nil | never] [-x number] [-z backup-ext] > > [--posix] [origfile [patchfile]] > > patch > Thanks for the report. > > Any idea how to implement the same thing using your version of 'patch'? > > Maybe just pass --posix for both GNU patch and other patch? All right. Does this work for you? diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 2f4b028bb4a..356da5ddfac 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1724,7 +1724,8 @@ vc-default-checkin-patch nil "-p1" "-r" null-device - "--no-backup-if-mismatch" + "--posix" + "--remove-empty-files" "-i" "-")) (user-error "Patch failed: %s" (buffer-string)))) (vc-call-backend backend 'checkin files comment))