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 03:52:17 +0300 Message-ID: <770dc627-c43a-a11f-6315-918bd083bf7c@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> <87a65tx74m.fsf@web.de> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------eIQEb8CbGsNtPOznq6GwI8cL" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="30199"; 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: Uwe Brauer , georges.racinet@octobus.net, emacs-devel@gnu.org To: "Dr. Arne Babenhauserheide" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Oct 24 06:30:56 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 1omp72-0007f8-HA for ged-emacs-devel@m.gmane-mx.org; Mon, 24 Oct 2022 06:30:56 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1omncS-0003Ta-QJ; Sun, 23 Oct 2022 22:55:16 -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 1omlhk-0001lj-TY for emacs-devel@gnu.org; Sun, 23 Oct 2022 20:52:36 -0400 Original-Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1omlhj-0007Uo-11 for emacs-devel@gnu.org; Sun, 23 Oct 2022 20:52:36 -0400 Original-Received: by mail-wm1-x32e.google.com with SMTP id c3-20020a1c3503000000b003bd21e3dd7aso9010586wma.1 for ; Sun, 23 Oct 2022 17:52:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=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=T3HE/YkemI3kVCR12gSj/5eJnWpI8/vDO6pUDoa3K58=; b=Ak+hRBC5EsKO2urN4eLohdanT0TWcDk4qqOQFNtmBshyxC8/ZP8GcbvPO4G+WUP9Wr 3kiIkfCxksQ5D9l18zvlfQUYkap8Yq1iqfEfyFLVzqRLH/EZZtl+7xaP7wO9JWTgt+qt 5NHeAbFn6oZE9ju1mGEeQpjSZytbOxOU8hlI0wMf+4HeLudvbY/YKMuuOosYgROs0L1E CsLTNuwwgkLiSo0O6A3fdJX8LIonSqju0rDcSAFGZDDw6WaHHRhz1UtOkNZcRNFYHd5l sjpMnqrmzrrEICFodYGUqjkOFP1HhLhkn8yPpfBGLwpiOFHd3eTrRf+VpYiTao2sv69Y I82Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=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=T3HE/YkemI3kVCR12gSj/5eJnWpI8/vDO6pUDoa3K58=; b=dX2ZfbYlRdxMgKjGnnx3R+RY27X5nNL9758uPLlfUgcqIXQsyV8c/mJkQS40oYqeOW Is6MfZdNzMqOoW95OFcSOqjnMNE4funYi2Z7JtR10Q2srtBrzQL2R5v0PfttnnjmuYAP UOVsOGCNG8fZl/ui2y0gjW1scGJk/KEuyv/iZY8XNg6hec5kuPk5tUo+o78SToPFVLbX YSV+/eq5vL9p83RAvH7F7hT6RXIQI8R9JJiMFSiA4ItWRXAWDu3QcTelV2WphHEwHbLa 3ajyjeYBPe5DvsTDCYPASOVmgccbBdUiHA2koOZ1ljOg0JuTW6uQivjJ6mcXG4iCTPr1 2KWQ== X-Gm-Message-State: ACrzQf1goFB2Na9FoTvLmLLmFrS+6Bg85X4xfeI2J1+olRVz0JH++RTy 7zsRzuNDDGMb5XznUqNj75A= X-Google-Smtp-Source: AMsMyM48oJa0iQ51npaGQBnIQn7Dv70DlEA2/8hQLmWOFMzliOQ2KjMm2sxyGFCcSzE8JZI8QiCBLQ== X-Received: by 2002:a05:600c:3512:b0:3c8:2c4e:8680 with SMTP id h18-20020a05600c351200b003c82c4e8680mr9497957wmq.165.1666572741011; Sun, 23 Oct 2022 17:52:21 -0700 (PDT) Original-Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id c192-20020a1c35c9000000b003c6fb525b4csm9359965wma.38.2022.10.23.17.52.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 23 Oct 2022 17:52:20 -0700 (PDT) Content-Language: en-US In-Reply-To: <87a65tx74m.fsf@web.de> Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=raaahh@gmail.com; helo=mail-wm1-x32e.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:298309 Archived-At: This is a multi-part message in MIME format. --------------eIQEb8CbGsNtPOznq6GwI8cL Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 18.10.2022 22:29, Dr. Arne Babenhauserheide wrote: > "Dr. Arne Babenhauserheide" writes: > >> hg import --bypass && hg update --merge --tool internal:merge-local > cleaner with tip (in case there are multiple heads): > > hg import --bypass && hg update --merge --tool internal:merge-local tip Thanks!. For best compatibility with existing behavior (default and vc-git's), it seems I was looking for the merge tool 'internal:local'. Could either of you test the attached patch? It should be both faster and a little safer than using the default impl. --------------eIQEb8CbGsNtPOznq6GwI8cL Content-Type: text/x-patch; charset=UTF-8; name="vc-hg-checkin-patch-with-mergetool-local.diff" Content-Disposition: attachment; filename="vc-hg-checkin-patch-with-mergetool-local.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2xpc3AvdmMvdmMtaGcuZWwgYi9saXNwL3ZjL3ZjLWhnLmVsCmluZGV4 IDJlZWJlMmQ1NDMuLjMwYjRlNTU4MTggMTAwNjQ0Ci0tLSBhL2xpc3AvdmMvdmMtaGcuZWwK KysrIGIvbGlzcC92Yy92Yy1oZy5lbApAQCAtMTE4OSwxNiArMTE4OSwzMiBAQCB2Yy1oZy1s b2ctZWRpdC1tb2RlCiAoZGVmdW4gdmMtaGctY2hlY2tpbiAoZmlsZXMgY29tbWVudCAmb3B0 aW9uYWwgX3JldikKICAgIkhnLXNwZWNpZmljIHZlcnNpb24gb2YgYHZjLWJhY2tlbmQtY2hl Y2tpbicuCiBSRVYgaXMgaWdub3JlZC4iCi0gIChsZXQgKChhbWVuZC1leHRyYWN0LWZuCi0g ICAgICAgICAobGFtYmRhICh2YWx1ZSkKLSAgICAgICAgICAgKHdoZW4gKGVxdWFsIHZhbHVl ICJ5ZXMiKQotICAgICAgICAgICAgIChsaXN0ICItLWFtZW5kIikpKSkpCi0gICAgKGFwcGx5 ICMndmMtaGctY29tbWFuZCBuaWwgMCBmaWxlcwotICAgICAgICAgICAobmNvbmMgKGxpc3Qg ImNvbW1pdCIgIi1tIikKLSAgICAgICAgICAgICAgICAgIChsb2ctZWRpdC1leHRyYWN0LWhl YWRlcnMgYCgoIkF1dGhvciIgLiAiLS11c2VyIikKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAoIkRhdGUiIC4gIi0tZGF0ZSIpCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKCJBbWVuZCIgLiAsYW1lbmQt ZXh0cmFjdC1mbikpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGNvbW1lbnQpKSkpKQorICAoYXBwbHkgIyd2Yy1oZy1jb21tYW5kIG5pbCAwIGZpbGVz CisgICAgICAgICAobmNvbmMgKGxpc3QgImNvbW1pdCIKKyAgICAgICAgICAgICAgICAgICAg ICAiLW0iKQorICAgICAgICAgICAgICAgICh2Yy1oZy0tZXh0cmFjdC1oZWFkZXJzIGNvbW1l bnQpKSkpCisKKyhkZWZ1biB2Yy1oZy1jaGVja2luLXBhdGNoIChwYXRjaC1zdHJpbmcgY29t bWVudCkKKyAgKGxldCAoKHBhdGNoLWZpbGUgKG1ha2UtdGVtcC1maWxlICJoZy1wYXRjaCIp KSkKKyAgICAod3JpdGUtcmVnaW9uIHBhdGNoLXN0cmluZyBuaWwgcGF0Y2gtZmlsZSkKKyAg ICAodW53aW5kLXByb3RlY3QKKyAgICAgICAgKHByb2duCisgICAgICAgICAgKGFwcGx5ICMn dmMtaGctY29tbWFuZCBuaWwgMCBuaWwKKyAgICAgICAgICAgICAgICAgKG5jb25jIChsaXN0 ICJpbXBvcnQiICItLWJ5cGFzcyIgcGF0Y2gtZmlsZSAiLW0iKQorICAgICAgICAgICAgICAg ICAgICAgICAgKHZjLWhnLS1leHRyYWN0LWhlYWRlcnMgY29tbWVudCkpKQorICAgICAgICAg ICh2Yy1oZy1jb21tYW5kIG5pbCAwIG5pbAorICAgICAgICAgICAgICAgICAgICAgICAgICJ1 cGRhdGUiCisgICAgICAgICAgICAgICAgICAgICAgICAgIi0tbWVyZ2UiICItLXRvb2wiICJp bnRlcm5hbDpsb2NhbCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAidGlwIikpCisgICAg ICAoZGVsZXRlLWZpbGUgcGF0Y2gtZmlsZSkpKSkKKworKGRlZnVuIHZjLWhnLS1leHRyYWN0 LWhlYWRlcnMgKGNvbW1lbnQpCisgIChsb2ctZWRpdC1leHRyYWN0LWhlYWRlcnMgYCgoIkF1 dGhvciIgLiAiLS11c2VyIikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICgiRGF0 ZSIgLiAiLS1kYXRlIikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICgiQW1lbmQi IC4gKGxhbWJkYSAodmFsdWUpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgKHdoZW4gKGVxdWFsIHZhbHVlICJ5ZXMiKQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgKGxpc3QgIi0tYW1lbmQiKSkpKSkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICBjb21tZW50KSkKIAogKGRlZnVuIHZjLWhnLWZpbmQt cmV2aXNpb24gKGZpbGUgcmV2IGJ1ZmZlcikKICAgKGxldCAoKGNvZGluZy1zeXN0ZW0tZm9y LXJlYWQgJ2JpbmFyeSkK --------------eIQEb8CbGsNtPOznq6GwI8cL--