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: Tue, 18 Oct 2022 20:30:34 +0300 Message-ID: <0bffec65-14d7-cf3f-5005-741790bc6d5e@yandex.ru> References: <87fsgyuyh7.fsf@mat.ucm.es> <87v8os9o8q.fsf@mat.ucm.es> <877d177mri.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> 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="36293"; 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: emacs-devel@gnu.org, Arne Babenhauserheide , georges.racinet@octobus.net To: Uwe Brauer Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Oct 18 19:44:46 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 1okqdx-0009G5-U0 for ged-emacs-devel@m.gmane-mx.org; Tue, 18 Oct 2022 19:44:45 +0200 Original-Received: from localhost ([::1]:45260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okqdw-0002De-Sl for ged-emacs-devel@m.gmane-mx.org; Tue, 18 Oct 2022 13:44:44 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:58738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okqQT-0004FD-Dn for emacs-devel@gnu.org; Tue, 18 Oct 2022 13:30:49 -0400 Original-Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:38642) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1okqQR-000387-CL for emacs-devel@gnu.org; Tue, 18 Oct 2022 13:30:49 -0400 Original-Received: by mail-wm1-x32c.google.com with SMTP id r8-20020a1c4408000000b003c47d5fd475so15595393wma.3 for ; Tue, 18 Oct 2022 10:30:37 -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=J2k5+lsmpzZ+nVQotB2sJn5vfCW64PTqOPFrJEgReOQ=; b=GtdW4pKZ4h9AfiN9iQCKA+4quRTfzHyTUCL3hPO2fZimu1TrTAT2GdzQHSN7bcGgN/ Bq3aoTnBdHzp4BMEcjVTiXaFJZWhqG7jzKv2LybIcz0pELj5czIJL4EjfW12sfxaQTvm xMy1Elt5yv3CW2uTCZNym5ZUYI3udZh3bSPsEHMqEhPgecC8nMOytJY522smFrj7Mfl/ IjWWy0gdF6cHpL8vSlbDTod+0phqwnb5cm7Bv5ao6PcmTFzBCV9WD66qJjl4DNdD1v2K TZbDGnC5NQdMSMqIVcfK006h99wL8XroDoDaB8DaEHVmQ9n/la2ZqStTOu4z/dygxyCb YeRQ== 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=J2k5+lsmpzZ+nVQotB2sJn5vfCW64PTqOPFrJEgReOQ=; b=VMnlpaWR66kFbyIWgLkFnYhotE5Jq/53pdztddkgADbWCjru18YPsd+w1PDHakxE/+ oz6ff7kSGJrzKpv+UIVr708VofE7bmvrhAnhdkp+SLRqneRY9umrwrYoMcogEA3bH0pB 2H/kr8DoVMQ8Oie/kQ9m+Pk3DqunQLzkfvsUmiqP5Ky7ioHPn/e+Eia2Mg9ujI/J4svk qGz784WweWfb4rQ9vwOm1eXNJPzbC+0E6A5ysL08IjtVzXuWDP+RuK4jgTMw2n9TNlMW 3QfTvXvMsvyF32U+oeVGKQZPZ06aqs6Cz85Sb+vFaxV1ni7qNvq+/7F0aJNotKN2TSgf Qp1A== X-Gm-Message-State: ACrzQf0i/M4VsjJR9JyK3R3T1DwW/AdtzAO4yDO2FbT8fLhT4luMzrIS mgXJjbQLmC4KUkf7EJFpd08= X-Google-Smtp-Source: AMsMyM5LOL5CMMQdiTBW7eCOsBrFJx37sZWylUFr/VJEKwK5zzo4BcYNVgkHnLipqwonFD9naTQ1Vw== X-Received: by 2002:a05:600c:310a:b0:3c6:f9a6:5a7d with SMTP id g10-20020a05600c310a00b003c6f9a65a7dmr6643592wmo.29.1666114236425; Tue, 18 Oct 2022 10:30:36 -0700 (PDT) Original-Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id g8-20020a7bc4c8000000b003c0d504a92csm18387657wmk.22.2022.10.18.10.30.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 18 Oct 2022 10:30:36 -0700 (PDT) Content-Language: en-US In-Reply-To: <87y1td84fc.fsf@mat.ucm.es> Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=raaahh@gmail.com; helo=mail-wm1-x32c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, 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: , 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:298068 Archived-At: On 18.10.2022 19:47, Uwe Brauer wrote: >>>> "DG" == Dmitry Gutov writes: > >> On 18.10.2022 18:38, Uwe Brauer wrote: >>> I am confused now! That description sounds like >>> hg update >>> to me >>> but it seems git reset --soft would not call a merge in the case you >>> describe > >> Right. > >>> what's about >>> hg update -C >>> Or is that more like git reset --hard? > >> Yes, 'hg update -C' is like 'git reset --hard', it that it discards >> uncommitted changes. 'hg update' tries to merge them instead. Just >> like 'git checkout' might do. Either way, they generally change file >> contents on disk. > >> 'git reset --soft' (or just 'git reset') doesn't touch file contents >> on disk. > > What's about > > hg uncommit Again, it changes file contents on disk. > Or > > Not sure > hg strip --keep -r . Not sure what this one does, but the description doesn't sound relevant. Is it more like 'git cherry-pick'? > But strip is usually slow. > > BTW I can't see much difference in your latest patch, I have to test it more, the emacs-hg is very slow even from the command line That's unfortunate.