From unknown Sat Jun 21 03:26:46 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#66211 <66211@debbugs.gnu.org> To: bug#66211 <66211@debbugs.gnu.org> Subject: Status: 30.0.50; C-x v v in vc-diff does not work with lesser versionf of patch Reply-To: bug#66211 <66211@debbugs.gnu.org> Date: Sat, 21 Jun 2025 10:26:46 +0000 retitle 66211 30.0.50; C-x v v in vc-diff does not work with lesser version= f of patch reassign 66211 emacs submitter 66211 "Alfred M. Szmidt" severity 66211 normal thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 26 08:18:04 2023 Received: (at submit) by debbugs.gnu.org; 26 Sep 2023 12:18:04 +0000 Received: from localhost ([127.0.0.1]:47537 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ql70t-0008Pr-TH for submit@debbugs.gnu.org; Tue, 26 Sep 2023 08:18:04 -0400 Received: from lists.gnu.org ([2001:470:142::17]:49664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ql70r-0008P8-QU for submit@debbugs.gnu.org; Tue, 26 Sep 2023 08:18:02 -0400 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 1ql70M-0001kY-Tj for bug-gnu-emacs@gnu.org; Tue, 26 Sep 2023 08:17:34 -0400 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 1ql70L-0001jY-FM for bug-gnu-emacs@gnu.org; Tue, 26 Sep 2023 08:17:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=Date:Subject:To:From:mime-version:in-reply-to: references; bh=ZaLVb3DEOOzY/FnkpRRPH0Lca3Zj2gboPGZEEXkYrm0=; b=jbjKac94fvf+zG H5gxLyV3Epe+g+hWJ+2pwLWpJQyFbrH2V4LZSQJ7HJz5LEyDO3WeeIZDPxZ3Z3u6IasbdngErhQtg BJrAIsJx7OxCwXexdXy0DqRbGERm3LbAHp8G3MbsuwzpNudqIz2LlP2A7L9nrbbplYzOa8Vk3kB8H lmcImcaWJ3Z+sPRzJJ0QMGqmuXABHuzd+Kn3H0A6u2A/C7UPj7mhkNAIOK9Qw5vi32ZkKpekOssWZ f0ogd/F3NlxZ28oEXv/8hlQH6v9fu6lCgDeQ3vHVJV/QHN3KlSI46gTc0terl1awoY+5ouYKhqPNB tXF4tCbMLdfsc184QeTw==; Received: from ams by fencepost.gnu.org with local (Exim 4.90_1) (envelope-from ) id 1ql70J-0003su-4A for bug-gnu-emacs@gnu.org; Tue, 26 Sep 2023 08:17:28 -0400 From: "Alfred M. Szmidt" To: bug-gnu-emacs@gnu.org Subject: 30.0.50; C-x v v in vc-diff does not work with lesser versionf of patch Message-Id: Date: Tue, 26 Sep 2023 08:17:27 -0400 X-Spam-Score: 0.1 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.9 (/) 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 ) id 1ql7LO-0003Fe-MF for submit@debbugs.gnu.org; Tue, 26 Sep 2023 08:39:14 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:52587) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ql7LM-0003FR-Cr for 66211@debbugs.gnu.org; Tue, 26 Sep 2023 08:39:13 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 45E1F5C25EB; Tue, 26 Sep 2023 08:38:54 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Tue, 26 Sep 2023 08:38:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=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= 1695731934; x=1695818334; bh=u5mxXmkcfm+TZmsE0u2mXAaFCD+30BHoPEx VPkKisXk=; b=C4A0RsWncJ6f0db1h6QfKu2AnbzGUb2m2VUZANPUz5JUlRSsqSI m84qk+i/2czCliHumdyqocbP6tUaKnvBZKFzWgGkLxXvAaXVb/fctWB9FCGIP7k3 +m/PQmSzKVtaAzn60xp+JcN68RiWYjVfAyJ68WINZ7FZZlnXtmepKZCt+mrHnOaP yCgr0+JLuEXQQS6ur14UEfdgxRux3vLye10W6ias6vfttz0ExwdsEhPbS1zk161e o8lu8v2PjfMVlPO+YoQ7GhPhCZ46/ft3N5mYEmu3FOovDPGwBF89YH4tTz2NK8mV AlMDOE9t3uBq4/F+V9Vg6TQAsF+SkCB7uiQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=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=1695731934; x= 1695818334; bh=u5mxXmkcfm+TZmsE0u2mXAaFCD+30BHoPExVPkKisXk=; b=A WoS/WlZkW9jROzeQVu6Jw4AKl9NC7sLNe5tu9sKuUusBJmOjPHqA5wOVejBWF0YR OF5gyVZqKMnPxGumHx9/BJCjXpSbkVYGtoGFWWBymJqvvdeEaW8D1bahjJYVfEA/ H7V435zKFbZb8UgpRHfNyA+27gSwY5pygqD2MyNDiPQ6+U7R6xku16QdN2kdUOxC auSiK3/cl1TCuNh2s3zqK8iXG4vKGzUTi1UwxgTHoFH6ftHL3FzUn3X7PgrmLWhx A5Am7mAPb7nXa9CpXKDVdSywiyEC5wQ0P9OU45WQhTIOIcRX+XNpaQVDqAPPaYKA 0qh+0kcwmWbrmwVKfHEiw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvjedrtddtgddviecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepkfffgggfuffvfhfhjggtgfesthejre dttdefjeenucfhrhhomhepffhmihhtrhihucfiuhhtohhvuceoughmihhtrhihsehguhht ohhvrdguvghvqeenucggtffrrghtthgvrhhnpeeghedthedujeeiteeutddtjeekheejte eukeehffdutdejuedvfeevueevieduudenucevlhhushhtvghrufhiiigvpedtnecurfgr rhgrmhepmhgrihhlfhhrohhmpegumhhithhrhiesghhuthhovhdruggvvh X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 26 Sep 2023 08:38:53 -0400 (EDT) Message-ID: <3e17d007-0c22-918d-2030-89b02b081d44@gutov.dev> Date: Tue, 26 Sep 2023 15:38:52 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: bug#66211: 30.0.50; C-x v v in vc-diff does not work with lesser versionf of patch Content-Language: en-US To: "Alfred M. Szmidt" , 66211@debbugs.gnu.org References: From: Dmitry Gutov In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -2.1 (--) X-Debbugs-Envelope-To: 66211 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.1 (---) On 26/09/2023 15:17, 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 ) id 1ql7Pw-0003Nc-Cf for submit@debbugs.gnu.org; Tue, 26 Sep 2023 08:43:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33830) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ql7Pr-0003NE-FA for 66211@debbugs.gnu.org; Tue, 26 Sep 2023 08:43:54 -0400 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 1ql7PZ-0000ew-1e; Tue, 26 Sep 2023 08:43:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=Date:References:Subject:In-Reply-To:To:From: mime-version; bh=wS2b5G8mH14ycID/seqZ7pfOSfj1qgNQlp6+WQ9nwvI=; b=p5fW1XBQyD/i er97oUFIIG1YaeNg35OGlqrT0LwcNETZzyTobnfg7CUc6+5n5ihcS1WhQBBPSZfb0+DClqJS13W67 Mea8YNpRBWK5qNk0WZRa+KBYjrn66OV6xpLoyiFoF/eiUn2eEtxL30nkhqZo13nwcj4HldroS/hok U0D1DIZ9mE39369FU9mA+slLuIlJZf+S0Ef1Y1oMkCG2VwxM6kTR4vR+7Jb04nNIhMfJJZLQcP3Lp 3IdHMHplTxH44kmF8I2Q9rw7H7rDY+JytncbiXWAzns8E3C/8IRpqINj7TzR08BZAIpS3/BgTl/jE Fcq1IXj/p61DY4weUkcfTg==; Received: from ams by fencepost.gnu.org with local (Exim 4.90_1) (envelope-from ) id 1ql7PY-0001Ku-Re; Tue, 26 Sep 2023 08:43:32 -0400 From: "Alfred M. Szmidt" To: Dmitry Gutov In-Reply-To: <3e17d007-0c22-918d-2030-89b02b081d44@gutov.dev> (message from Dmitry Gutov on Tue, 26 Sep 2023 15:38:52 +0300) Subject: Re: bug#66211: 30.0.50; C-x v v in vc-diff does not work with lesser versionf of patch References: <3e17d007-0c22-918d-2030-89b02b081d44@gutov.dev> Message-Id: Date: Tue, 26 Sep 2023 08:43:32 -0400 X-Spam-Score: -2.2 (--) X-Debbugs-Envelope-To: 66211 Cc: 66211@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.2 (---) > 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 From the GNU patch manual: The --no-backup-if-mismatch option causes patch to not create backup files, even for mismatched patches; this is the default when conforming to POSIX. Scoundering the patch(1) man page: -b, --backup Save a backup copy of the file before it is modified. By default the original file is saved with a backup extension of ".orig" unless the file already has a numbered backup, in which case a numbered backup is made. This is equivalent to specifying "-V existing". This option is currently the default, unless --posix is specified. And looking further, --posix: --posix Enables strict IEEE Std 1003.1-2008 ("POSIX.1") conformance, specifically: 1. Backup files are not created unless the -b option is specified. 2. If unspecified, the file name used is the first of the old, new and index files that exists. From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 26 09:38:55 2023 Received: (at 66211) by debbugs.gnu.org; 26 Sep 2023 13:38:55 +0000 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 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 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) 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 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 26 Sep 2023 09:38:30 -0400 (EDT) Message-ID: <9ea150f8-eb57-b44a-146b-ea6addf26cfc@gutov.dev> Date: Tue, 26 Sep 2023 16:38:28 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: bug#66211: 30.0.50; C-x v v in vc-diff does not work with lesser versionf of patch Content-Language: en-US To: "Alfred M. Szmidt" References: <3e17d007-0c22-918d-2030-89b02b081d44@gutov.dev> From: Dmitry Gutov In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -2.1 (--) X-Debbugs-Envelope-To: 66211 Cc: 66211@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.1 (---) 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)) From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 26 11:08:31 2023 Received: (at 66211) by debbugs.gnu.org; 26 Sep 2023 15:08:31 +0000 Received: from localhost ([127.0.0.1]:49557 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ql9fr-0007gL-9s for submit@debbugs.gnu.org; Tue, 26 Sep 2023 11:08:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ql9fl-0007g1-Bu for 66211@debbugs.gnu.org; Tue, 26 Sep 2023 11:08:29 -0400 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 1ql9fS-0003VW-Os; Tue, 26 Sep 2023 11:08:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=Date:References:Subject:In-Reply-To:To:From: mime-version; bh=o2QqX0Ath1aO6eLxomUAddLW+ZMBGBVu2D1AOCNf27I=; b=j4xCx6qdPQs4 N2X84fuyF1qRVCB/pT7sKsuJvsMrPyfJ0xkGJ+FdeQLhavWjMxblOwtetRsVRmLZhyV844gI9THGj 25OqVK9gOuR1jKU9KDd+8V2oZmh1NyuvXlZzmgD+jP5aiCkvU9xcqqZKEGloL+TcY6eg3n0nARFzn lj5gvDlB+auZtlfT4fDfwR0Yo6iSUM2Lq8apE3CslJFyzG7GCRBZNLNrM1tQAOrMVPYNpfiC9OOfB 4lZ5AJlA4QgsyUiDAnX0OZOPPAffPUG1tLpeHowFCX4DkmM2IKgX1LuX/u4s8At6oI7ZclyiKonC8 NFaKDzXsaMSdgiKDpsA/yQ==; Received: from ams by fencepost.gnu.org with local (Exim 4.90_1) (envelope-from ) id 1ql9fS-0004p7-I8; Tue, 26 Sep 2023 11:08:06 -0400 From: "Alfred M. Szmidt" To: Dmitry Gutov In-Reply-To: <9ea150f8-eb57-b44a-146b-ea6addf26cfc@gutov.dev> (message from Dmitry Gutov on Tue, 26 Sep 2023 16:38:28 +0300) Subject: Re: bug#66211: 30.0.50; C-x v v in vc-diff does not work with lesser versionf of patch References: <3e17d007-0c22-918d-2030-89b02b081d44@gutov.dev> <9ea150f8-eb57-b44a-146b-ea6addf26cfc@gutov.dev> Message-Id: Date: Tue, 26 Sep 2023 11:08:06 -0400 X-Spam-Score: -2.2 (--) X-Debbugs-Envelope-To: 66211 Cc: 66211@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.2 (---) 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. From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 26 12:31:06 2023 Received: (at 66211) by debbugs.gnu.org; 26 Sep 2023 16:31:06 +0000 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 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 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) 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 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 26 Sep 2023 12:30:40 -0400 (EDT) Message-ID: <7b5c8506-8e9b-dfd5-81b7-7f5d4193c94b@gutov.dev> Date: Tue, 26 Sep 2023 19:30:39 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: bug#66211: 30.0.50; C-x v v in vc-diff does not work with lesser versionf of patch Content-Language: en-US To: "Alfred M. Szmidt" References: <3e17d007-0c22-918d-2030-89b02b081d44@gutov.dev> <9ea150f8-eb57-b44a-146b-ea6addf26cfc@gutov.dev> From: Dmitry Gutov In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -2.1 (--) X-Debbugs-Envelope-To: 66211 Cc: 66211@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.1 (---) 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 From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 26 12:51:48 2023 Received: (at 66211) by debbugs.gnu.org; 26 Sep 2023 16:51:48 +0000 Received: from localhost ([127.0.0.1]:49647 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlBHn-00024y-Vp for submit@debbugs.gnu.org; Tue, 26 Sep 2023 12:51:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58170) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlBHj-00024j-QK for 66211@debbugs.gnu.org; Tue, 26 Sep 2023 12:51:46 -0400 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 1qlBHG-0004PP-Ng; Tue, 26 Sep 2023 12:51:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=Date:References:Subject:In-Reply-To:To:From: mime-version; bh=Q8/lXWRlRKdce2Cto6VMoqos33sKG0a8Je7jhXM5y68=; b=rexsum/p0Osv ET74SEDYPt/d+YuewDm6gDiCQokSCe+FayiaMMDCAODp3g6jtPBIXvB2Ao8jJcZtenp5idkAcSYDe uPvfJ+medgSpIZ+XtqJSO9K7Jf60w7lA4MxktMxKSzg+9DL8LKI6qGGHD3ab8R1Y8CPM5FpUtZdy9 95+csc1lo2OWqLc9zCL4rtmdJDM/mep02FjaVCjmwef/lyz2kSEr6LsvBPOyxR6JvQeSxBclsW3/u hJwx8F2+AmLJhLzOUZScG54pAZNhYhz9N6ub2WFjm1MftmqWhxyezqbSRTUg6IDOiWI89vZkXnivZ RHaWBDjlN7CrTGJD12F7Cg==; Received: from ams by fencepost.gnu.org with local (Exim 4.90_1) (envelope-from ) id 1qlBHG-0008Eb-9s; Tue, 26 Sep 2023 12:51:14 -0400 From: "Alfred M. Szmidt" To: Dmitry Gutov In-Reply-To: <7b5c8506-8e9b-dfd5-81b7-7f5d4193c94b@gutov.dev> (message from Dmitry Gutov on Tue, 26 Sep 2023 19:30:39 +0300) Subject: Re: bug#66211: 30.0.50; C-x v v in vc-diff does not work with lesser versionf of patch References: <3e17d007-0c22-918d-2030-89b02b081d44@gutov.dev> <9ea150f8-eb57-b44a-146b-ea6addf26cfc@gutov.dev> <7b5c8506-8e9b-dfd5-81b7-7f5d4193c94b@gutov.dev> Message-Id: Date: Tue, 26 Sep 2023 12:51:14 -0400 X-Spam-Score: -2.2 (--) X-Debbugs-Envelope-To: 66211 Cc: 66211@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.2 (---) 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". I stand corrected, the short form output when you pass a wrong argument didn't show the switch. I'll try tomorrow. Both FreeBSD and OpenBSD seem to support it: https://man.freebsd.org/cgi/man.cgi?patch(1) https://man.openbsd.org/patch.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 29 03:06:52 2023 Received: (at 66211) by debbugs.gnu.org; 29 Sep 2023 07:06:52 +0000 Received: from localhost ([127.0.0.1]:55030 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm7aO-0000xL-0d for submit@debbugs.gnu.org; Fri, 29 Sep 2023 03:06:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52708) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm7aI-0000x1-RF for 66211@debbugs.gnu.org; Fri, 29 Sep 2023 03:06:50 -0400 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 1qm7Zy-00069m-Pw; Fri, 29 Sep 2023 03:06:26 -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=LuA8B4RI8iQoi5Oz1xR6nOMpMQ/51qfX1eHPRlrHy1g=; b=nGOfW54TEnDH 5YnMFy3EQSaYwLMXw5xRvhnomyKa1KySdGwhBoK4U40MJ+t/qwt9YZr1EYg2s+eF/IpBMtva0/oBJ oADT6FVMnjML9X0w0veqgnJnnYZf/AptbAj7rVFB2G31woR3vdvNyXtmrYV7ww+b6ZW/ecvkioEeR vzTsHcUbXR7D1mncA3QF3RuiPnTPERPukl9YykhV/Mw7Vfb5rrAJcAvRcfAjTAHxozDZ7vg8Ndt2p Ivq/ZbWnRfBKJvGnQytL/4qSUQ2TAuuKpYbNerXRLP/Xy0uQp0wwXt8ZXIMzLa0mEiJeUKKW+PbUf VM86MF/g3qBJIJZK+5E1tg==; Date: Fri, 29 Sep 2023 10:05:51 +0300 Message-Id: <83h6nd1msw.fsf@gnu.org> From: Eli Zaretskii To: "Alfred M. Szmidt" , Dmitry Gutov In-Reply-To: (ams@gnu.org) Subject: Re: bug#66211: 30.0.50; C-x v v in vc-diff does not work with lesser versionf of patch References: X-Spam-Score: -2.2 (--) X-Debbugs-Envelope-To: 66211 Cc: 66211@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.2 (---) > 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 ) id 1qmAeI-0006f5-OQ for submit@debbugs.gnu.org; Fri, 29 Sep 2023 06:23:07 -0400 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:35209) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmAeE-0006eY-Rb for 66211@debbugs.gnu.org; Fri, 29 Sep 2023 06:23:05 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.west.internal (Postfix) with ESMTP id 0413E3200805; Fri, 29 Sep 2023 06:22:41 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Fri, 29 Sep 2023 06:22: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= 1695982961; x=1696069361; bh=O9TtB4ehkiJKw/qwxPU6XSB3AiFtEOuo3Tu Ql7onaEQ=; b=Toi8BLSsNhz6kL981Rqjp4/yAOU+ho2aqEhqcu3TaopLsQe2hJe 3sfE4QFAnLy7ELiqDxDTsh7ebzEnQxbjAsDE7+PZfASsXvk201xDQ4OGLGzO3Mm2 +xoCHcnmaKBT5Bb13V6QGfMj0/toAnN0e1LKr5dO3k9rzIC7aFzSmcwE56p7G3HV ZOIioCyqS8JMWU6taHfkQFXTicc6Swdb43mEENGq77cuJIe1MBsuXUJKzYH3lQ+/ YwOwcTAX+OI3A/i9A7aBi2HaqyoCEa478MzgP9BPOHEYKs/9M88ByK6euBli/STI J3G4SrtgOd3rVvAy73q4mFkkCiYwyEJ2iog== 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= 1695982961; x=1696069361; bh=O9TtB4ehkiJKw/qwxPU6XSB3AiFtEOuo3Tu Ql7onaEQ=; b=asf91xIU+uOvVcXdyPX5/IiKzLNYUy2ExxuVC9dwAwI0YcWy7K1 HvEKmAsWSPfEgdzoZXTOA6uV/U/1Vck5+qQ+Sy2gPWBRmC09Lc9Au69LhaJYF8nJ MldTmTjz0iXo5wzsXlEWKBI/OArb/13uTg8R6Stw3FUX4aDf5YVWNQ7LzqD/SEBN afOm7DxA43vv9FIaG/Gs7mYTfSoCEHqGQPYQhd2cQduVU62wLJtCMnljAoTkJ8xt 6kSbdXNyx5Yvvu4TJlf2AS+365GX4ReiloME8FMNNT6v8YCfeaaXfc+eiJTMjX4N rBumD7LD0m3y12GCwuyDw4mMoRx1QWRIiRw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrtddvgddvjecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefkffggfgfuvfevfhfhjggtgfesthejredttdefjeenucfhrhhomhepffhmihht rhihucfiuhhtohhvuceoughmihhtrhihsehguhhtohhvrdguvghvqeenucggtffrrghtth gvrhhnpeeigfetveehveevffehledtueekieeikeeufeegudfgfeeghfdulefgfeevledv veenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegumh hithhrhiesghhuthhovhdruggvvh X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 29 Sep 2023 06:22:40 -0400 (EDT) Message-ID: <78f8becb-7150-33cb-537c-47728b305699@gutov.dev> Date: Fri, 29 Sep 2023 13:22:39 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: bug#66211: 30.0.50; C-x v v in vc-diff does not work with lesser versionf of patch Content-Language: en-US To: Eli Zaretskii , "Alfred M. Szmidt" References: <83h6nd1msw.fsf@gnu.org> From: Dmitry Gutov In-Reply-To: <83h6nd1msw.fsf@gnu.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -2.1 (--) X-Debbugs-Envelope-To: 66211 Cc: 66211@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.1 (---) 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. From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 29 11:22:56 2023 Received: (at 66211) by debbugs.gnu.org; 29 Sep 2023 15:22:56 +0000 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 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 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==; Date: Fri, 29 Sep 2023 18:22:09 +0300 Message-Id: <835y3typge.fsf@gnu.org> From: Eli Zaretskii To: Dmitry Gutov In-Reply-To: <78f8becb-7150-33cb-537c-47728b305699@gutov.dev> (message from Dmitry Gutov on Fri, 29 Sep 2023 13:22:39 +0300) Subject: Re: bug#66211: 30.0.50; C-x v v in vc-diff does not work with lesser versionf of patch References: <83h6nd1msw.fsf@gnu.org> <78f8becb-7150-33cb-537c-47728b305699@gutov.dev> X-Spam-Score: -2.2 (--) X-Debbugs-Envelope-To: 66211 Cc: ams@gnu.org, 66211@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.2 (---) > 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? From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 29 13:27:51 2023 Received: (at 66211) by debbugs.gnu.org; 29 Sep 2023 17:27:51 +0000 Received: from localhost ([127.0.0.1]:57157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmHHH-0008GR-TE for submit@debbugs.gnu.org; Fri, 29 Sep 2023 13:27:51 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:46331) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmHHF-0008GD-7g for 66211@debbugs.gnu.org; Fri, 29 Sep 2023 13:27:46 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 2FBA75C2655; Fri, 29 Sep 2023 13:27:25 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Fri, 29 Sep 2023 13:27:25 -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= 1696008445; x=1696094845; bh=o+v+DgOBmzLFaOfqYz4/eupJUSIL+w5kR8j 3r6YLJFI=; b=Y5cBFza1xGUv7oQ0KHfxAofnAHbr2QnLD1uPtPFv+XKd2XP3CnE NHXb7nqWs1ameqr+LcqVWFv1EGQCG8pBQ/qFCfNU2Z2Ym/r9fNB+A+UIaY2EGk/t YRi/9PhjqkDNsHpzihNyvF2rayvMtW1XcF/0jyKCJe2biwQVVP9ci0aNKEOXdanV lffmIpjtbiSWwOpzjXZ2pGZsvgM2adLftxLPmKGaFYs9GdG8DYRP3ayG9h/urVDf 7+5IWQBYkN+ScEtXfHdwhAxkWPrN/rvG8rGRJYd3kLd7SY8nMQv06bCph6vy3JK7 zLGQAEgmYQlJaKLb067J48QnUPUTJXkApGQ== 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= 1696008445; x=1696094845; bh=o+v+DgOBmzLFaOfqYz4/eupJUSIL+w5kR8j 3r6YLJFI=; b=e9qvQVeMPQNbiCCEgjJchZzNO2bSog0YN4fc/s2EhgCj+pAhiWJ oLQu0j4/28hjLsivOCsbf3K9jz9r/R3MXmHZ2S7njh7W9Eyp+vbiL3Il/uaowBvf 6qmrhL68133KQQIs8d7nHbziFp0DmZ+CXUzK1j6e448dKTt8lYOM3+CPnwaTdcXZ WsygYGRvC1euw4SFabdtYDfNV4z8ifab6quu6nT5P1Xye5eJkVvo94384RX1GrFW 3DuUorlRQuiy9+kMqcZvSRD+rve7/6gPGhqQPS+QOiyF++UBKwqfft8y/Pq+yH9M dIHmljvTeiMQD7wN6HZFv2fDp4JoPDYeBFA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrtddvgdduuddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtfeejnecuhfhrohhmpeffmhhi thhrhicuifhuthhovhcuoegumhhithhrhiesghhuthhovhdruggvvheqnecuggftrfgrth htvghrnhephfeutdekveeggeetteekfeejffegudduudfhueevleeftdffffeggeeivddv jeelnecuffhomhgrihhnpehgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepughmihhtrhihsehguhhtohhvrdguvghv X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 29 Sep 2023 13:27:23 -0400 (EDT) Message-ID: <1e1f0e18-1fe2-4bb4-38f3-1c49de831abc@gutov.dev> Date: Fri, 29 Sep 2023 20:27:21 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: bug#66211: 30.0.50; C-x v v in vc-diff does not work with lesser versionf of patch Content-Language: en-US To: Eli Zaretskii References: <83h6nd1msw.fsf@gnu.org> <78f8becb-7150-33cb-537c-47728b305699@gutov.dev> <835y3typge.fsf@gnu.org> From: Dmitry Gutov In-Reply-To: <835y3typge.fsf@gnu.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -2.1 (--) X-Debbugs-Envelope-To: 66211 Cc: ams@gnu.org, 66211@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.1 (---) On 29/09/2023 18:22, Eli Zaretskii wrote: >> 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? https://lists.gnu.org/archive/html/emacs-devel/2022-10/msg01353.html Anyway, it doesn't seem like 'patch' itself is the problem in this case: the alternative flags should work for BSD Patch as well. Though I'm still waiting for confirmation. From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 29 13:41:07 2023 Received: (at 66211) by debbugs.gnu.org; 29 Sep 2023 17:41:07 +0000 Received: from localhost ([127.0.0.1]:57171 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmHUB-0000FD-7s for submit@debbugs.gnu.org; Fri, 29 Sep 2023 13:41:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49220) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmHU6-0000EX-VR for 66211@debbugs.gnu.org; Fri, 29 Sep 2023 13:41:06 -0400 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 1qmHTm-00012n-Kx; Fri, 29 Sep 2023 13:40:42 -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=t+qW/4EDxfAN6wok1LSD9Uqq5kHhEgslwHGCEkQGrtg=; b=OOSn4ZqTlz3L SzyJyUjhyQQij29a41V1iEvOzL4N7WA/xv59SQ48EGv9F2dAWdjxvzSGSqsLSBJWxwPa6/4Kej72w kN4K40m5PRjFAmMViWvUwGzerC/8CM+zo2oA49kyNvdGNdH6HbRC3/2DwqK5J/Q7dsZ96B8FnI/Kl KQ8iPGrKePDSnRgNm7C1IkzMEoEPMTFQmpfPn9p5ODQWUhlR0yQ4nXThnFIWRhfd66eHF1pErw/8g XZVRL+Vkegk13QbOgVhs9T8KMzpJSzd43z7atlMYX6ZdzHSKrQYBmBrJrRGmuU+CDzaZF1rlnHDOW IDMln+kqdKEk1CNKnkCUcA==; Date: Fri, 29 Sep 2023 20:40:23 +0300 Message-Id: <831qegc1yw.fsf@gnu.org> From: Eli Zaretskii To: Dmitry Gutov In-Reply-To: <1e1f0e18-1fe2-4bb4-38f3-1c49de831abc@gutov.dev> (message from Dmitry Gutov on Fri, 29 Sep 2023 20:27:21 +0300) Subject: Re: bug#66211: 30.0.50; C-x v v in vc-diff does not work with lesser versionf of patch References: <83h6nd1msw.fsf@gnu.org> <78f8becb-7150-33cb-537c-47728b305699@gutov.dev> <835y3typge.fsf@gnu.org> <1e1f0e18-1fe2-4bb4-38f3-1c49de831abc@gutov.dev> X-Spam-Score: -2.2 (--) X-Debbugs-Envelope-To: 66211 Cc: ams@gnu.org, 66211@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.2 (---) > Date: Fri, 29 Sep 2023 20:27:21 +0300 > Cc: ams@gnu.org, 66211@debbugs.gnu.org > From: Dmitry Gutov > > On 29/09/2023 18:22, Eli Zaretskii wrote: > >> 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? > > https://lists.gnu.org/archive/html/emacs-devel/2022-10/msg01353.html That doesn't have a lot in the way of answering my question above. > Anyway, it doesn't seem like 'patch' itself is the problem in this case: When Patch is installed, sure. But using our own code is better because it doesn't need Patch and doesn't have to rely on specific options it may or may not support. I'm not insisting, mind you, just asking. It sounds inconsistent with what we do in similar situations in other places, that's all. From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 29 14:11:52 2023 Received: (at 66211) by debbugs.gnu.org; 29 Sep 2023 18:11:52 +0000 Received: from localhost ([127.0.0.1]:57178 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmHxw-0003rA-36 for submit@debbugs.gnu.org; Fri, 29 Sep 2023 14:11:52 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:52259) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmHxt-0003qo-Cv for 66211@debbugs.gnu.org; Fri, 29 Sep 2023 14:11:50 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 56A8C5C00E1; Fri, 29 Sep 2023 14:11:29 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Fri, 29 Sep 2023 14:11:29 -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= 1696011089; x=1696097489; bh=jTcjD3wIS9V5AwRH0IvuS+Crdqm+tATS5VF S7JwyVRs=; b=EHmmkW6BxKjxqhTtKhdMBDu+9xnPMJ4Gm36mCQ0bPVpktAS4bDV qMUo28yk5uNYGGRG0aGQLvZZhWzYY98odIVf1fQgC2xKpDrF7Gf2bn5K1UBc9iRI f67iznhqaEx3tAM/mQSkdW8pVVM8LJrUrZLDq4uONDyHGfHzrwsgUa7hzVj8cECV Hr1E8UhiB2KVhdW/72YGgR5EPlW/lxuYujv2cTBoVVnX5WC5go0pz02eygtShmBn PyqY9p/y6fMNi9j2DqY962EkG8k8qxy6nbLcPDkHU42KLDILS9TlOBgcmC+EvbLv M5uMhXVp5H/9w7ZdqJ9yhkvZ0e/ffACHOWQ== 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= 1696011089; x=1696097489; bh=jTcjD3wIS9V5AwRH0IvuS+Crdqm+tATS5VF S7JwyVRs=; b=gA3JQtVdIvlj3cltET8eEHKptuIrpE6CSxYNbT7bcf3JW71GCNp hSRgYNm+rtZjoPQ5cGoGy5jbXKCK7EilyFi7E6CbZBIpY/yHR7BwPOrkHGl1g7v4 wlaSZImCo7O1rvHKHvT58CK4ybxttNZQiFzP9764ABJok+mdpnnpwY5L4Ia7N3Rj GrvoHNTr4reopnKf4q7HxqIX5yJUr/SzmC5z+6q7HWjabf5sc8EeVESMRv4FOhXU KRpkQ0/14UjvK6EsoT/bSqA1RRgGzl+DmseG1eUEqERKIyhw/ka+BcYkUjlyNoHI zrEVcTypC2DWQutq43A4Y9NCLJS29GciCtw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrtddvgdduvddtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtfeejnecuhfhrohhmpeffmhhi thhrhicuifhuthhovhcuoegumhhithhrhiesghhuthhovhdruggvvheqnecuggftrfgrth htvghrnhephfeutdekveeggeetteekfeejffegudduudfhueevleeftdffffeggeeivddv jeelnecuffhomhgrihhnpehgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepughmihhtrhihsehguhhtohhvrdguvghv X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 29 Sep 2023 14:11:27 -0400 (EDT) Message-ID: <3949ad53-045d-b012-fc02-e3dee9f683c9@gutov.dev> Date: Fri, 29 Sep 2023 21:11:26 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: bug#66211: 30.0.50; C-x v v in vc-diff does not work with lesser versionf of patch Content-Language: en-US To: Eli Zaretskii References: <83h6nd1msw.fsf@gnu.org> <78f8becb-7150-33cb-537c-47728b305699@gutov.dev> <835y3typge.fsf@gnu.org> <1e1f0e18-1fe2-4bb4-38f3-1c49de831abc@gutov.dev> <831qegc1yw.fsf@gnu.org> From: Dmitry Gutov In-Reply-To: <831qegc1yw.fsf@gnu.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -2.1 (--) X-Debbugs-Envelope-To: 66211 Cc: ams@gnu.org, 66211@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.1 (---) On 29/09/2023 20:40, Eli Zaretskii wrote: >> Date: Fri, 29 Sep 2023 20:27:21 +0300 >> Cc: ams@gnu.org, 66211@debbugs.gnu.org >> From: Dmitry Gutov >> >> On 29/09/2023 18:22, Eli Zaretskii wrote: >>>> 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? >> >> https://lists.gnu.org/archive/html/emacs-devel/2022-10/msg01353.html > > That doesn't have a lot in the way of answering my question above. The discussion regarding that choice is inside the quotes' ladder in that message. >> Anyway, it doesn't seem like 'patch' itself is the problem in this case: > > When Patch is installed, sure. But using our own code is better > because it doesn't need Patch and doesn't have to rely on specific > options it may or may not support. > > I'm not insisting, mind you, just asking. It sounds inconsistent with > what we do in similar situations in other places, that's all. My preference was to limit the number of points of unreliability. And/or minor differences (e.g. whether file removals are supported). 'diff-apply-buffer' has only been checked in, we can revisit this a little later, after more testing and stuff. From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 29 14:36:36 2023 Received: (at 66211) by debbugs.gnu.org; 29 Sep 2023 18:36:36 +0000 Received: from localhost ([127.0.0.1]:57190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmILr-0004dW-Sk for submit@debbugs.gnu.org; Fri, 29 Sep 2023 14:36:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55876) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmILm-0004dD-VQ for 66211@debbugs.gnu.org; Fri, 29 Sep 2023 14:36:34 -0400 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 1qmILS-0005kE-Da; Fri, 29 Sep 2023 14:36:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=Date:References:Subject:In-Reply-To:To:From: mime-version; bh=70CX/2UEXa8xDDncu9LwGED6pZcAnuLz3Nhkeq4dfO8=; b=EXgZzp0l/7mx ZMejKxsus4eYKQGVWFc+s5gsdvmOK9UMrGwtLhFtF+wB91wfM2H1Li5q3lJRzGQhrPBQxtdkcp+69 ScVAmmCgu/0fITGfOpHDiBsGbP+ME4Au2OJrbuUHiBz20ALa97dNWEIFvXQr+bIAkRZjEX05bkLJL EUPL4mmtPcOOg8EesSxSp0HKE7jFSrPKHSQ73YFpLgYXr3OaN1ywSlft92DBs5k06mxBedP5E/tnC jCu1uQP4CYZIvpp5jNbusz5L8aIozUD6wfVsQ/alYv8tRlwBelc5XizvxbWz6UhzLoiJa0Xk3bw2+ 5tgQU24Y61QhEArez17NnA==; Received: from ams by fencepost.gnu.org with local (Exim 4.90_1) (envelope-from ) id 1qmILS-0002mH-6x; Fri, 29 Sep 2023 14:36:10 -0400 From: "Alfred M. Szmidt" To: Dmitry Gutov In-Reply-To: <1e1f0e18-1fe2-4bb4-38f3-1c49de831abc@gutov.dev> (message from Dmitry Gutov on Fri, 29 Sep 2023 20:27:21 +0300) Subject: Re: bug#66211: 30.0.50; C-x v v in vc-diff does not work with lesser versionf of patch References: <83h6nd1msw.fsf@gnu.org> <78f8becb-7150-33cb-537c-47728b305699@gutov.dev> <835y3typge.fsf@gnu.org> <1e1f0e18-1fe2-4bb4-38f3-1c49de831abc@gutov.dev> Message-Id: Date: Fri, 29 Sep 2023 14:36:10 -0400 X-Spam-Score: -2.2 (--) X-Debbugs-Envelope-To: 66211 Cc: eliz@gnu.org, 66211@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.2 (---) Sorry, I have no interest in verifying this at this point. Eli's behaviour is beyond my mood right now. Maybe some other time. From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 07 18:34:10 2023 Received: (at 66211) by debbugs.gnu.org; 7 Oct 2023 22:34:10 +0000 Received: from localhost ([127.0.0.1]:56049 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpFs9-0001yI-Ov for submit@debbugs.gnu.org; Sat, 07 Oct 2023 18:34:10 -0400 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:46507) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpFs7-0001y0-Bc for 66211@debbugs.gnu.org; Sat, 07 Oct 2023 18:34:08 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id B3E9E32009D7; Sat, 7 Oct 2023 18:33:41 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sat, 07 Oct 2023 18:33:41 -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= 1696718021; x=1696804421; bh=xTfdjn2mmIB/NpGKn1F6TUM8EDPsUJocknG n7jzl5eU=; b=JLiFGaSLj+B8yrWiPw3Z5OVLD6WePFfmMD2h3OWMHzaneh09OBH dm6L6zamHXOxSc0l3vQHhJemk9KySQSdRMB9vnyxgx3v/JKZGHW9lHOzQ7dLTcv1 lU0h6TnBbIqMyqSJMMJmVWq+gvhe/ctxGp/VqBvRLFZRUmlX4RKa+LVtFXaN+gn8 fySoDeYk1qjYIFmejQHbDUOrrXT3n2DHWUHYIKaQtN3qjvr4TpKirzh33FUlIcEp 5s00hrOewRnfnfZDTAkjsPKoY7YwBK2SAOAEvKQoasKYmygpu3Zj2dVYdz9noVaA kLkB/VVZ3kPX4ikXHMurw+x6yxgc+o3DMBA== 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= 1696718021; x=1696804421; bh=xTfdjn2mmIB/NpGKn1F6TUM8EDPsUJocknG n7jzl5eU=; b=B3c9roxAu0DxQIGR00wznwhCTkrDVTGcm27GyDRkJNz2TkHzM+X jtY4sfFiJtBq0+90gK9LQAPGTcTvsEeWqUkGZs66rm9YdGiQpWF85jAlTg+OZ1dV vdSuAsVSkDJLZHnByBrttDQ9EKuRW208mJ80uuZ3IHHSO/3ZONEQdTw5E60f2z3m 7Y0azy5qvaE6tknm/B1QkX+iAUapbx9ndj17Pyho/WpQI7T9f4meci6xwUe9AwtL c2OepRH8DV82j8zKH202vAnP1ZzulFyai9sY2bTt2kLT54mgRhxRjE4wfcbGhE/v zrrsf71RGbZSB3RwCgsnDa8+VmzNXTeabBQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrhedtgddutdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepkfffgggfuffvvehfhfgjtgfgsehtje ertddtfeejnecuhfhrohhmpeffmhhithhrhicuifhuthhovhcuoegumhhithhrhiesghhu thhovhdruggvvheqnecuggftrfgrthhtvghrnhepiefgteevheevveffheeltdeukeeiie ekueefgedugfefgefhudelgfefveelvdevnecuvehluhhsthgvrhfuihiivgeptdenucfr rghrrghmpehmrghilhhfrhhomhepughmihhtrhihsehguhhtohhvrdguvghv X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 7 Oct 2023 18:33:40 -0400 (EDT) Message-ID: <2d22d07b-5581-c228-f4fb-01f33ff97b91@gutov.dev> Date: Sun, 8 Oct 2023 01:33:37 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: bug#66211: 30.0.50; C-x v v in vc-diff does not work with lesser versionf of patch Content-Language: en-US To: "Alfred M. Szmidt" References: <3e17d007-0c22-918d-2030-89b02b081d44@gutov.dev> <9ea150f8-eb57-b44a-146b-ea6addf26cfc@gutov.dev> From: Dmitry Gutov In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -2.1 (--) X-Debbugs-Envelope-To: 66211 Cc: 66211@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.1 (---) 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" Perhaps some other OpenBSD/FreeBSD user wants to verify this patch? The scenario is making a commit from a vc-diff buffer (with 'C-x v v' there) managed by Bzr or SVN or CVS. From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 08 01:02:24 2023 Received: (at 66211) by debbugs.gnu.org; 8 Oct 2023 05:02:24 +0000 Received: from localhost ([127.0.0.1]:56144 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpLvr-0004PQ-Sc for submit@debbugs.gnu.org; Sun, 08 Oct 2023 01:02:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53742) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpLvp-0004PC-8Y for 66211@debbugs.gnu.org; Sun, 08 Oct 2023 01:02:22 -0400 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 1qpLvP-0000CM-Nq; Sun, 08 Oct 2023 01:01:55 -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=htEJcYBLSNICmr2PpApezUoaZ5refs1cWKF1CbvO6cs=; b=rcJ2tr86asDC OpN05+JEurM04TWOPqHZnwr+l0LTMUW9E6E088XpqBl4zvzbbFLHJZaBtGoZzWWOnRFPx5TG1mJJ6 i99BIzMDW9ffElC5pH5h8tNw44ehlHB2XW7pFvBtVjqw5IzL5Q20XyMo37/TwQgy3Ys9Qb1Yo94XU kxpB00ZWp+OQd25QoEK/cJso7kMrGV/zSO2tHonUL8W3eeF4ucuMtdCRXxl/OTbMiOQTjNXwK4RWU pyhZ7i8mBmqLfwKpbRob3s5Jh1h4XvZIozJAewNJjoNDNHwt2DC41KplZNBZuDNiOZn+TTQd0JUO6 epPHRkCJRl/dVzPssNr1Dw==; Date: Sun, 08 Oct 2023 08:01:42 +0300 Message-Id: <83bkd9zozt.fsf@gnu.org> From: Eli Zaretskii To: Dmitry Gutov In-Reply-To: <2d22d07b-5581-c228-f4fb-01f33ff97b91@gutov.dev> (message from Dmitry Gutov on Sun, 8 Oct 2023 01:33:37 +0300) Subject: Re: bug#66211: 30.0.50; C-x v v in vc-diff does not work with lesser versionf of patch References: <3e17d007-0c22-918d-2030-89b02b081d44@gutov.dev> <9ea150f8-eb57-b44a-146b-ea6addf26cfc@gutov.dev> <2d22d07b-5581-c228-f4fb-01f33ff97b91@gutov.dev> X-Spam-Score: -2.2 (--) X-Debbugs-Envelope-To: 66211 Cc: ams@gnu.org, 66211@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.2 (---) > Cc: 66211@debbugs.gnu.org > Date: Sun, 8 Oct 2023 01:33:37 +0300 > From: Dmitry Gutov > > 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" > > Perhaps some other OpenBSD/FreeBSD user wants to verify this patch? If no one steps forward in a week or so, I suggest that you install this anyway. From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 14 13:11:02 2023 Received: (at 66211-done) by debbugs.gnu.org; 14 Oct 2023 17:11:02 +0000 Received: from localhost ([127.0.0.1]:50347 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qriAI-0002hd-10 for submit@debbugs.gnu.org; Sat, 14 Oct 2023 13:11:02 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:52083) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qriAE-0002hH-Vo for 66211-done@debbugs.gnu.org; Sat, 14 Oct 2023 13:11:00 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 24EA45C0287; Sat, 14 Oct 2023 13:10:30 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Sat, 14 Oct 2023 13:10:30 -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= 1697303430; x=1697389830; bh=MegPwtVhI/QjonvurepFxQ9k/2nN8TKcKid GsPy0oiQ=; b=xp7ga6aWW6clC1cWcJDeT3KZqXRkyyC9OCM61fM/GNzBGwgcwrg 3ceBk1F9Zz3wjaYjh2vdL4I4j0pryTwSfxv90a5+xejO1zsKsMkWLoaLe3falsUk GzeZgFKJbCi+GO62R7RrbVMEa7LoKfKz9rxCPD75VbbnCiPyEk5ZG1eEBObX5iQQ NIhPFILHu4d4VlKM908Yx0lQsJgoJMuXkfaXp5WG5mwIEEUywInSBALdj9hppUYe WSscDhV9GSW1hSSC5lT5WwnnfxSJhP8hdOBaHIdHpwPxHDnEWMEg9HBoYtE9IrxF rfVzh548VjBrTqXJAdMyknzyZnWbXyDRcJQ== 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=fm3; t= 1697303430; x=1697389830; bh=MegPwtVhI/QjonvurepFxQ9k/2nN8TKcKid GsPy0oiQ=; b=O97xk77uOrqxIkS0noJjsOgGH75yAc3RgveePdUEuQg9fS3vGnf AcFCfCRTaap/femW1NTsEap7Ag1Mj01xQinMsGpc17mrgKI6gkbMIKq1qfCUh+Db HdixtDubxrMR9icSIypoYEM0YVBs/BdzmDoUrd7u9ib7jSW9Tu1iRMVB+nK3xeey sfqsjkVlqMBWrQs8H3Ggyj65yRyNvLf+xbd7Ht3sL3cjH5bLJSJS+WCdgdT3nUWh K2iij55Igi0oDJMRD+TjudFlcv7ocU4H5MdhQkAWtKjFomfE7dorKcNKJRl7LQH6 vwZtmnx1V9wXDeVPHDANcDOYdZ74HeG608A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrieehgddutdekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtfeejnecuhfhrohhmpeffmhhi thhrhicuifhuthhovhcuoegumhhithhrhiesghhuthhovhdruggvvheqnecuggftrfgrth htvghrnhepiefgteevheevveffheeltdeukeeiieekueefgedugfefgefhudelgfefveel vdevnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepug hmihhtrhihsehguhhtohhvrdguvghv X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 14 Oct 2023 13:10:28 -0400 (EDT) Message-ID: Date: Sat, 14 Oct 2023 20:10:26 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: bug#66211: 30.0.50; C-x v v in vc-diff does not work with lesser versionf of patch Content-Language: en-US To: Eli Zaretskii References: <3e17d007-0c22-918d-2030-89b02b081d44@gutov.dev> <9ea150f8-eb57-b44a-146b-ea6addf26cfc@gutov.dev> <2d22d07b-5581-c228-f4fb-01f33ff97b91@gutov.dev> <83bkd9zozt.fsf@gnu.org> From: Dmitry Gutov In-Reply-To: <83bkd9zozt.fsf@gnu.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -2.1 (--) X-Debbugs-Envelope-To: 66211-done Cc: 66211-done@debbugs.gnu.org, ams@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.1 (---) On 08/10/2023 08:01, Eli Zaretskii wrote: >> Cc:66211@debbugs.gnu.org >> Date: Sun, 8 Oct 2023 01:33:37 +0300 >> From: Dmitry Gutov >> >> 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" >> Perhaps some other OpenBSD/FreeBSD user wants to verify this patch? > If no one steps forward in a week or so, I suggest that you install > this anyway. Okay, done. Thanks. From unknown Sat Jun 21 03:26:46 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 12 Nov 2023 12:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator