From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii 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: Fri, 29 Sep 2023 18:22:09 +0300 Message-ID: <835y3typge.fsf@gnu.org> References: <83h6nd1msw.fsf@gnu.org> <78f8becb-7150-33cb-537c-47728b305699@gutov.dev> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="12825"; mail-complaints-to="usenet@ciao.gmane.io" Cc: ams@gnu.org, 66211@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Sep 29 17:23:29 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 1qmFKy-0002xK-JW for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 29 Sep 2023 17:23:28 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qmFKN-0005Dn-Pc; Fri, 29 Sep 2023 11:22: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 1qmFKK-0005DI-PH for bug-gnu-emacs@gnu.org; Fri, 29 Sep 2023 11:22:48 -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 1qmFKK-0002ke-HH for bug-gnu-emacs@gnu.org; Fri, 29 Sep 2023 11:22:48 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qmFKY-0004I4-Jk for bug-gnu-emacs@gnu.org; Fri, 29 Sep 2023 11:23:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 29 Sep 2023 15:23: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.169600097616479 (code B ref 66211); Fri, 29 Sep 2023 15:23:02 +0000 Original-Received: (at 66211) by debbugs.gnu.org; 29 Sep 2023 15:22:56 +0000 Original-Received: from localhost ([127.0.0.1]:56939 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmFKR-0004Hj-U6 for submit@debbugs.gnu.org; Fri, 29 Sep 2023 11:22:56 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:43002) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmFKQ-0004HU-3G for 66211@debbugs.gnu.org; Fri, 29 Sep 2023 11:22:55 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qmFK4-0002iv-0M; Fri, 29 Sep 2023 11:22:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=psphCGBhj6JrULyC2HzwDQo63zO51+X7tU4uM1L/aGo=; b=sKBRETfNZPgD mGdAFkRk/0ksnNaJ21ot4o1oeIJgvdlvsNyjKJIJkr1mB/adEpFqpDhGG+/IBYiG7sbfhe39f9plB c8AUWiI3crr8VqswOTXB5VanXlsOyRN1ISQ34gYyYqgHWv8Nu4IpFQaXQcg8bhGbofdQHJP0emC3X OlN9/76WGpAIOjNtOImq8cXcaMKQvFdmGdeWkfYdeLmdDM4uhPiT4uXD+9v30di40tPDeRR1XwcSa 2YJiGlCFyZmvfTF2r8CCVEAC8jTsqTgCc4XPvQa8aBp7CB7ik7HbmnQ4+62qJJIli8o/GF15EiVcv Bt5Dj8HN5AeJakIQ3MFTMg==; In-Reply-To: <78f8becb-7150-33cb-537c-47728b305699@gutov.dev> (message from Dmitry Gutov on Fri, 29 Sep 2023 13:22:39 +0300) 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:271499 Archived-At: > Date: Fri, 29 Sep 2023 13:22:39 +0300 > Cc: 66211@debbugs.gnu.org > From: Dmitry Gutov > > On 29/09/2023 10:05, Eli Zaretskii wrote: > >> From: "Alfred M. Szmidt" > >> Date: Tue, 26 Sep 2023 08:17:27 -0400 > >> > >> > >> 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 > I don't understand: does "git apply" invoke Patch? AFAICT, "C-x v v" > > in a*vc-diff* buffer runs "git apply FILE", where FILE is a temporary > > patch file created from the diffs to be applied. What am I missing? > > vc-default-checkin-patch calls 'patch'. It's for other backends. Why do we call Patch if we have a way to apply hunks in Lisp? Wasn't that just discussed in the other thread?