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.devel Subject: Re: master 4803fba487 1/2: 'C-x v v' on a diff buffer commits it as a patch (bug#52349) Date: Tue, 30 Aug 2022 20:37:11 +0300 Message-ID: <83h71ttyyg.fsf@gnu.org> References: <166171593185.16640.41619657947456727@vcs2.savannah.gnu.org> <20220828194533.23A6BC00889@vcs2.savannah.gnu.org> <87r10znm0y.fsf@gnus.org> <83fshfvvyn.fsf@gnu.org> <83bks3vtf5.fsf@gnu.org> <83tu5uug68.fsf@gnu.org> <86o7w1zniw.fsf@mail.linkov.net> <83ler5u0fj.fsf@gnu.org> <4ee591ed-accb-57c3-b9bb-9e97435af492@yandex.ru> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="24236"; mail-complaints-to="usenet@ciao.gmane.io" Cc: juri@jurta.org, larsi@gnus.org, emacs-devel@gnu.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Aug 30 20:07:10 2022 Return-path: Envelope-to: ged-emacs-devel@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 1oT5dl-00066a-CZ for ged-emacs-devel@m.gmane-mx.org; Tue, 30 Aug 2022 20:07:09 +0200 Original-Received: from localhost ([::1]:36824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oT5dk-0006sO-98 for ged-emacs-devel@m.gmane-mx.org; Tue, 30 Aug 2022 14:07:08 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:40014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oT5AP-0002DT-5Q for emacs-devel@gnu.org; Tue, 30 Aug 2022 13:36:49 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:35976) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oT5AO-00012W-Ff; Tue, 30 Aug 2022 13:36:48 -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=J3uMFY7zOZciGWZ47e71XE5ygQkaSaAU3zgK657APFE=; b=YjdGKiOU1rDp Djax1Dp7iKiMQHjRkB5z596HRNA+sSdHYkG9d1PQ1chz4GKa9rFTuBvsItwVsb1YgLVR9fO29uSdP lBiQKrX48anorEkUuZ2qk0bDBXOBSeCH+4YI68wldVC2X8iUKgjRdEiddAg/R9e8LRoVz1M0FTSKv 3ANgL/5J+MLnMH8dQwJNrN0frr/1t48luuf308Sd1Ru4zEeI0OyHuhrz+ShPBlNj+xsDcgDl59oYj fT4+y9XrYjnXVvymiBEX9Sswq2zo3Pacnxgvfq6Tzv8VImeA7zCbuqyNOqyMs7vtbdhGSli0p+04q MnPYlJFmyHOQMyApBIcx3A==; Original-Received: from [87.69.77.57] (port=4989 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oT5AN-0004dj-3O; Tue, 30 Aug 2022 13:36:48 -0400 In-Reply-To: <4ee591ed-accb-57c3-b9bb-9e97435af492@yandex.ru> (message from Dmitry Gutov on Tue, 30 Aug 2022 20:11:52 +0300) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:294375 Archived-At: > Date: Tue, 30 Aug 2022 20:11:52 +0300 > Cc: larsi@gnus.org, emacs-devel@gnu.org > From: Dmitry Gutov > > On 30.08.2022 20:05, Eli Zaretskii wrote: > >> Indeed, just 'M-! git apply' before using 'vc-checkin-patch' will do the job > >> in case of an external patch. > > Unless some of the hunks are wrong or produce conflicts or are > > rejected due to 1001 reasons. Which is exactly the use case I thought > > this enabled. Sorry for misreading. > > Not sure how we could possibly automate that problem away. You don't need to. Aborting a botched patch is easy; once the problematic hunks are known (they are announced by Patch or by "git apply"), you use this facility to filter them out, and patch/commit again.