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 19:33:04 +0300 Message-ID: <797f19ff-f27a-7363-2d4e-7131a3f0a02d@yandex.ru> References: <87fsgyuyh7.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> <770dc627-c43a-a11f-6315-918bd083bf7c@yandex.ru> <87h6zt2q29.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="11747"; 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: "Dr. Arne Babenhauserheide" , georges.racinet@octobus.net, emacs-devel@gnu.org To: Uwe Brauer Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Oct 24 19:19:41 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 1on16y-0002u3-W1 for ged-emacs-devel@m.gmane-mx.org; Mon, 24 Oct 2022 19:19:41 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1on0O8-0004m0-Lw; Mon, 24 Oct 2022 12:33: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 1on0O6-0004lb-UX for emacs-devel@gnu.org; Mon, 24 Oct 2022 12:33:18 -0400 Original-Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1on0O5-0003L9-4o for emacs-devel@gnu.org; Mon, 24 Oct 2022 12:33:18 -0400 Original-Received: by mail-wr1-x433.google.com with SMTP id g12so4315383wrs.10 for ; Mon, 24 Oct 2022 09:33:08 -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=AQfUFe/zGR6bJVboagTlb/CVACC1ym4zrub7U4mzqjM=; b=REeX0NjsCbmy5TDDxehR9QNc2wkiijJjtXohMnZEfrW2P5fKlcKd48e3zR+2ieUpcp QlJDdzrKiKJdVznD/xTgIneZeknFqald3+xkPZN10nOf4sSWvxtzV/s+Yw5gxjwKlL/n ntVHKgkmBDScs5mTSozuXDizAFe0T4Mm20JysjAT8C4A/ATPTX9JFHBOFJQOtyMI1isX axmj4zinv5tSs2KEzO+yROYwJVPvNcWIznIifB5joZfZb+KsOThdoBBwOKGOvIO9iWk7 /ZF+i3DktP7Yh+7CBu6i9bx672G4LmHGuewvY8jqdImd6CwJIw8IW2tJjdscIqdkGEWW wv3g== 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=AQfUFe/zGR6bJVboagTlb/CVACC1ym4zrub7U4mzqjM=; b=kLZm87VENnPTrjVS8lgh++GAVjkNaTFlPCxANFogiGA1Q1fsiMOn9YJWLXcRu1mbLN YCbJYqUl5dHz+m4vYt5ZoPGZnijoEOg7GstPrMha5s4XQ8zDHQX4AT2M9i+Gc6WDXlja zGvFj+0FZQU/XWVVkNJmV+AywERlUyeNy6yUbM4sRjN2M/uJXWSK9y4lPWiqdrzG32Pn vziskUMEvzFqS1uD7bUvqHp15dEtz6HbIlD94NYiUPtxFhoMewMOfj7VwdySRiTBZ7dy PKNSwDJS56plysWMqGvhlfF/+jKjt56v8SLg6VPuf7iEsgNaHXHdmTpxRoKvT+zJyQ4T 4syg== X-Gm-Message-State: ACrzQf3qPFm9HU9cBptiWClJUqLMHOEoeUxVQyX1YONjsg9M9WyW3LZg UOLrGX0Zf8fWK+dfxCl2xZE= X-Google-Smtp-Source: AMsMyM6dnpkKumpJL7AjyORtTpWG2K2z5Lqy6lWHPGaaACenU4hR/PRHVdFktl43ut7inQhMQwYFcg== X-Received: by 2002:a05:6000:1843:b0:236:770b:1af with SMTP id c3-20020a056000184300b00236770b01afmr2671259wri.486.1666629186911; Mon, 24 Oct 2022 09:33:06 -0700 (PDT) Original-Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id n9-20020a05600c3b8900b003b4ff30e566sm20581364wms.3.2022.10.24.09.33.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Oct 2022 09:33:06 -0700 (PDT) Content-Language: en-US In-Reply-To: <87h6zt2q29.fsf@mat.ucm.es> Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=raaahh@gmail.com; helo=mail-wr1-x433.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:298395 Archived-At: On 24.10.2022 18:34, Uwe Brauer wrote: >>>> "DG" == Dmitry Gutov writes: >> 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? > Sure, the attached diff is against the actual master I presume? > > Yup.