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 19:30:39 +0300 Message-ID: <7b5c8506-8e9b-dfd5-81b7-7f5d4193c94b@gutov.dev> References: <3e17d007-0c22-918d-2030-89b02b081d44@gutov.dev> <9ea150f8-eb57-b44a-146b-ea6addf26cfc@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="13997"; 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 18:32:12 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 1qlAyo-0003Q6-Ej for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 26 Sep 2023 18:32:11 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qlAyW-0003lg-DW; Tue, 26 Sep 2023 12:31:52 -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 1qlAyT-0003iM-VC for bug-gnu-emacs@gnu.org; Tue, 26 Sep 2023 12:31: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 1qlAyT-0007xg-Mc for bug-gnu-emacs@gnu.org; Tue, 26 Sep 2023 12:31:49 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qlAyg-0001WO-Br for bug-gnu-emacs@gnu.org; Tue, 26 Sep 2023 12:32: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 16:32: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.16957458665783 (code B ref 66211); Tue, 26 Sep 2023 16:32:02 +0000 Original-Received: (at 66211) by debbugs.gnu.org; 26 Sep 2023 16:31:06 +0000 Original-Received: from localhost ([127.0.0.1]:49628 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlAxl-0001VD-QJ for submit@debbugs.gnu.org; Tue, 26 Sep 2023 12:31:06 -0400 Original-Received: from out3-smtp.messagingengine.com ([66.111.4.27]:60333) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlAxh-0001Ud-Da for 66211@debbugs.gnu.org; Tue, 26 Sep 2023 12:31:04 -0400 Original-Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 116315C2639; Tue, 26 Sep 2023 12:30:42 -0400 (EDT) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 26 Sep 2023 12:30:42 -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= 1695745842; x=1695832242; bh=u0AMfCLfPCaEZw+C0OZnYhgv4Q5GA0eZ0Ua FZSDOHCs=; b=B7jkOEcbzbr+kgOOGKTiD35p18DqS4dDmDp2bzoIW0S4vhLO5v+ oG+lee6xAix0Kpfyi8r+tb7F0lYq3oniru05aJChgWrgoNMsVKxeNJGoOf5BPvgN 6OMcPPOeaKS18smBqAbXcioK00MkQVM22Xk8wTHu7gmMcOgNJqfitijvok2+Dcue 5ML3YPT/zjgBvekT3y324BmWVhbM0vMQh7STTi++qNI0aEMbR2tYiOZSYdG8QnF7 g8LJ8ibgGE27YOZMa7a6YaAXaV3GGPcHzzmrJXXxMmcH4lmdRMu0jEuJLFdRVcIU 7g0mX7tyH3pgJ/pozz1GBdWHQExEJDf80Vg== 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= 1695745842; x=1695832242; bh=u0AMfCLfPCaEZw+C0OZnYhgv4Q5GA0eZ0Ua FZSDOHCs=; b=JEVPDQQ7dxeG3Ss9Yy7zOJiO5j2qQXzFYubDM5xFqVkYR/LJ7MT beZxsl3tD0Ia2+t5SS80j4ooAoRgezzgi/lpOAid9foVAriz3pK0usp0lP7mHGpK 2LB7aeCH8p6Calah91bCZ9h/S4Rlxm28bgSEIbVi8nG4/TXHCNcelKsuceCM+u4+ fi4lqKsx1m0k/sMQmkakCw/Bfm5O+54P57z57uTx0lRQisKeuM+g/zVLNbz/1HyF ZsmpnNyZGFiUfHbgZ4HBdMpgW5ZVIQ2o9Y/AeuSsG2LwwHd1orz4if97u8kmHnib 9+s2sKgkj7WEZ6z+Sa1/HWS0zxu1jGdMidA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvjedrtddtgdejvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepkfffgggfuffvvehfhfgjtgfgsehtje ertddtfeejnecuhfhrohhmpeffmhhithhrhicuifhuthhovhcuoegumhhithhrhiesghhu thhovhdruggvvheqnecuggftrfgrthhtvghrnhepkeeuteejjeeiieeiledvgeetvddtie efvefhleekleekveduvdejudehueeiheetnecuffhomhgrihhnpehfrhgvvggsshgurdho rhhgpdhophgvnhgsshgurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrg hmpehmrghilhhfrhhomhepughmihhtrhihsehguhhtohhvrdguvghv X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 26 Sep 2023 12:30:40 -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:271383 Archived-At: On 26/09/2023 18:08, Alfred M. Szmidt wrote: > 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" > > > Patch on BSD doe not have --remote-empty-files. Just to make sure: did you try the correct spelling? "remove", not "remote". Both FreeBSD and OpenBSD seem to support it: https://man.freebsd.org/cgi/man.cgi?patch(1) https://man.openbsd.org/patch.1