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.devel Subject: Re: [patch: first impression] Date: Mon, 24 Oct 2022 04:03:54 +0300 Message-ID: <9508331b-ed94-060d-ff9a-018031cf59c4@yandex.ru> References: <87fsgyuyh7.fsf@mat.ucm.es> <520c15a0-a82b-657f-c47f-8f030521980a@yandex.ru> <87fsfv1yau.fsf@mat.ucm.es> <43e67d5a-e3f4-3e7d-cd0e-819a08279d7e@yandex.ru> <877d16khai.fsf@mat.ucm.es> <878rlmim4q.fsf@mat.ucm.es> <7ae1356e-ff81-5445-ab6f-bf431678bf69@yandex.ru> <877d16fgfr.fsf@mat.ucm.es> <0cc26283-3e36-d418-6f72-99fa31304a9d@yandex.ru> <87sfjmgoya.fsf@mat.ucm.es> <87v8oh63oq.fsf@mat.ucm.es> <084455a1-cd60-1350-6947-964f255f912e@yandex.ru> <87o7u945xu.fsf@mat.ucm.es> <5df61fcd-f085-c59a-1389-2573fdce40d7@yandex.ru> <877d0x3zwx.fsf@mat.ucm.es> <9fa5fa58-d7f2-bb79-e6c6-be01c7edc065@yandex.ru> <87y1td84fc.fsf@mat.ucm.es> <0bffec65-14d7-cf3f-5005-741790bc6d5e@yandex.ru> <87ilkhx7i4.fsf@web.de> <87v8ogcqwt.fsf@mat.ucm.es> 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="10795"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.2.2 Cc: georges.racinet@octobus.net, emacs-devel@gnu.org To: Uwe Brauer , "Dr. Arne Babenhauserheide" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Oct 24 08:34:28 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 1omr2a-0002aj-I8 for ged-emacs-devel@m.gmane-mx.org; Mon, 24 Oct 2022 08:34:28 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1omncW-0003gg-6y; Sun, 23 Oct 2022 22:55:20 -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 1omlsx-0005bw-9c for emacs-devel@gnu.org; Sun, 23 Oct 2022 21:04:11 -0400 Original-Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1omlsu-00011N-Dn for emacs-devel@gnu.org; Sun, 23 Oct 2022 21:04:11 -0400 Original-Received: by mail-wm1-x336.google.com with SMTP id bg9-20020a05600c3c8900b003bf249616b0so5692442wmb.3 for ; Sun, 23 Oct 2022 18:03:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:from:to:cc:subject:date:message-id:reply-to; bh=F3t5qggPN6JcQyeR9OsSp8jsOt66NOXCXxlem0im0g8=; b=ZRZitZBOghY+PLmrres2qDK9Xv4hIrX8OREDuqxhUx+A8dNPQrPMy5j+mWu520tu2H YUrR62litn+DmRSxMTWvRutYImeA/tK9mq91YqD/OezjygUqKT/BAfOn6D9URZKIFE3q Bo2d2x6m/jueso40ngoOJ3uTzE6v4JKGOEMjE4PQ07pIX/Btxhn2S886S1lW3LI4wkXx ijPb26wbWuiGEqNqcLd4pFQ3crHhu6x+7z88aIv14JnoPOzwMeQKrbj0DyNQ01gqMHfu 4R3pMx30fVjZeQNl4+dqOnU7AbadQ9nbTMosHZNlah3U+67Xuy69zdp5OUpEuqk+x/VG uqng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=F3t5qggPN6JcQyeR9OsSp8jsOt66NOXCXxlem0im0g8=; b=unlhJrxIlqc86c3/TGe6PP1Lhqvdyrp71WBBajqHCVuxDxiT7Gk4REhaKUpydCjwzx RtwiXO6k/OEPV6UszEInr7NYq1AQlgcD+K+wt2iVs/+oUpeeIHvH4BF+GNYTOKzJXA/a 42DZwgBxznSiDPtKjawgGejtOeFvjmc6+AFtkmDoytES4y3x/DN60iQt3nk3VjfpG+lg SV1LYRaEGXD3uRwk4n8KKkHXGI20tKJ1Rwt+H9njd/fnY8Atw94iubZOmxd8WcAF+8vg s/+dl1AVNVhGI8+ThtBDHu/pNXiqOFeVG3lFkc7mZ3E+fd47U6HE6vpnWwgEZd//BxPR l7Ew== X-Gm-Message-State: ACrzQf10wLonEiSCaiosLFLNIDMCBujwnPm9f6K+2T62OclDV96ydZj1 cEH+hgsIq4UmyfbXHQF0og0= X-Google-Smtp-Source: AMsMyM7h1giofFUVTx8aDp5UZYwgl2A3nH7gM+HKkvEwZehbMCU9gl4T4GwcC001M++PJkrg6XUNxw== X-Received: by 2002:a05:600c:2cbb:b0:3c6:c4d9:6004 with SMTP id h27-20020a05600c2cbb00b003c6c4d96004mr40672784wmc.66.1666573436991; Sun, 23 Oct 2022 18:03:56 -0700 (PDT) Original-Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id v5-20020a5d6105000000b0022afbd02c69sm24444104wrt.56.2022.10.23.18.03.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 23 Oct 2022 18:03:56 -0700 (PDT) Content-Language: en-US In-Reply-To: <87v8ogcqwt.fsf@mat.ucm.es> Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=raaahh@gmail.com; helo=mail-wm1-x336.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: , Original-Sender: "Emacs-devel" Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:298340 Archived-At: On 19.10.2022 08:40, Uwe Brauer wrote: > Dmitry, with this approach maybe then even > hg shelve -i > would be doable? I suppose something like this could work for Git and Hg: 1) Stash/Shelve all current changes. 2) Apply the provided patch. Somehow deal carefully with the new files in there, especially when said files are already present (and unregistered) in the work tree. Probably by scanning the file list in the patch in advance and 'git add'-ing all the existing new file first in step 1. 3) Stash the currently applied new changes. Also don't forget to 'git add' any unregistered files. 4) Unstash/unshelve the previous stash. And I guess it will require a new key binding in diff-mode buffers.