From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: "Dr. Arne Babenhauserheide" Newsgroups: gmane.emacs.devel Subject: Re: [patch: first impression] Date: Tue, 18 Oct 2022 21:17:42 +0200 Message-ID: <87ilkhx7i4.fsf@web.de> References: <87fsgyuyh7.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> <0bffec65-14d7-cf3f-5005-741790bc6d5e@yandex.ru> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="33157"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: mu4e 1.8.9; emacs 28.1 Cc: Uwe Brauer , georges.racinet@octobus.net, emacs-devel@gnu.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Oct 18 21:27:42 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 1oksFZ-0008RM-CU for ged-emacs-devel@m.gmane-mx.org; Tue, 18 Oct 2022 21:27:41 +0200 Original-Received: from localhost ([::1]:53374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oksFX-0000Zv-TK for ged-emacs-devel@m.gmane-mx.org; Tue, 18 Oct 2022 15:27:39 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oks9t-00068B-Nc for emacs-devel@gnu.org; Tue, 18 Oct 2022 15:21:52 -0400 Original-Received: from mout.web.de ([217.72.192.78]:54803) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oks9q-0003E5-NA for emacs-devel@gnu.org; Tue, 18 Oct 2022 15:21:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1666120901; bh=jv35ZsbNWhRJlkGfN7s8uTP7JeHi4cpvHEdoGY2OTl0=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to; b=BceinwLnMafwcJ2W8j0oJsiiPa2u4gNFdJEQ+AegXV3GceAqT27WWOD0H871DGfz+ Pe1m69GMi8abreLJR4pWQ8SwVLw6Fhq+GJcjrqAccolFdJ6VDHoMgsDoq9EqFq/oG4 /NRV8mlH1NRPa8UGcihc6SlwH3b8akt2G44IjgMuKEBTW/GJnJU5gh0I51Q8MwJ+zK C0gc+0HTm3PkCuWshwXJKFfuOSrvUVsfmWCrWB4l1KyyPUUYRcEA1Pc8WUlRLEKAWq /a4MRCA5gMdYeD9l6fYMgmnUCDwUN/odbBr84VHN+smV7F2sRroKT6POp+k9eGOu4b cVZtUxPuq9Spg== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Original-Received: from fluss ([84.165.20.127]) by smtp.web.de (mrweb106 [213.165.67.124]) with ESMTPSA (Nemesis) id 1Mm9Zi-1pShIj26Eq-00iSaZ; Tue, 18 Oct 2022 21:21:41 +0200 In-reply-to: <0bffec65-14d7-cf3f-5005-741790bc6d5e@yandex.ru> X-Provags-ID: V03:K1:ENSVtDIC78xSxOPmnBYm6oV2BaIozmIjBZBlsKJnaCvqTOTks5O NYoMPjF3eJrQmtTgBR2/XYzvB2BVdv3mRsZc3MbkHH3f9WaxgAEkMgQ5U6KFkUKnN27wAdl BD9aPc7WXIKbBqX5YQTEyY7UxuPylSW5GyoJmfc61geJcU4R14TVwSqMtY2FXdYqtU7Mxeb fccRT2fzTfL34G4qeS7IA== X-UI-Out-Filterresults: notjunk:1;V03:K0:HeK+K8rFAZQ=:v4jpGw6O/5fzHnkJ2ai8XY ZfcvvHnkyF9oC/sWuQRjP3y1aVx36KXjKeWLk0tFxLLag1lzIK7T8oGPmBlJ/PO6kNVynU1KK Nf2tMcqdiy4CX6O74SEFx5LsqmAXImg3kkBOzcr/EnBluKyA3/I8KeZ2Fp+pmcgbLYiDb6D+B haNtHyaCVy4kkY3xnMM488q+a95nbh4lXtwzaVcCYHI5nk3PwVT1Y4jqS+cDiLM4Vl4A0ApDy GuF7tjGPpVLh2LBdSCKU2fgjHIMdGpDQCI2m1UpZpSr4t0yMCj7cqjOtCm29Fi219XPbWvZY2 hAw4SoNKkb74DAQIKrWMf9MNazu9BV0MgXEYXq/N9HYKjYPS//TiI/koBoK4xrpytO4vXHjAn 98LwG2Z5UQu7foGGNhy+p6Ar7hZ1DCmZfm2vpdUNYHmJoC5BXCzCjYyxnU13EB0Y8SYJvpGHb Z31SA1QndE/SW7LtwBw0r2TP3DHpFzhf5+JtMXGHJC40xWMTPPawSr1/6ZSzFIJxDI+QT/pvI n0uwPXVnXyVtu7ewnW/ZoS3g3arX6iiIkiO0FvqXITkA8FIB2ANSlKSTef73mNnL+bvjJsUx4 f3wjRDe4pGJ5U+rMB3n5ctXc/gSNm75/LCz3gHdrjUTl2ZMgg/cwj428dZmpu05n2mvptUpBg usctA7qu0t7t+RmD5dCJ7ZU/u13i2yaNnftzt87EVziwRwfempLarU5iwT5ct5lz0xWY50I43 HwhEn/ywxjoWkHUCIZmTyiBOgkawUyUWJxEHJzPKykhrYyut05lnSuYQjtYWn28PS7F30ymm Received-SPF: pass client-ip=217.72.192.78; envelope-from=arne_bab@web.de; helo=mout.web.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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:298071 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Dmitry Gutov writes: >>>>> "DG" =3D=3D 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 The goal is to make the modified files stay exactly as they are, right? For that you can use the merge tool that always uses the local changes: hg import --bypass && hg update --merge --tool internal:merge-local (see hg help mergetool for details) =E2=87=92 import the patch, then update and in case of conflict, use the lo= cal version. To test: hg init foo cd foo echo first > 1 hg add 1 hg ci -m first echo interactive.patch > 1 hg diff > interactive.patch echo second > 1 hg import --bypass interactive.patch -m "interactive.patch" hg update --merge --tool internal:merge-local hg diff Result: diff --git a/1 b/1 =2D-- a/1 +++ b/1 @@ -1,1 +1,1 @@ =2Dinteractive.patch +second Best wishes, Arne =2D-=20 Unpolitisch sein hei=C3=9Ft politisch sein, ohne es zu merken. draketo.de --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJEBAEBCAAuFiEE801qEjXQSQPNItXAE++NRSQDw+sFAmNO/MQQHGFybmVfYmFi QHdlYi5kZQAKCRAT741FJAPD65L1D/0Vzm1jxKXW8BAGVsoqvxIVXGDzYIvZZZOg 4Mq/Y5nbTjseFGjTKdZGirmqaHiXvZ5EALHirqwlZlHSI9wYwJO39R+haTtPaUNJ +FiVqUDlYhIZfF5eEKuZDvC69SVxCW04RSvMPGhkGARgg1jF6jmbWySpI6sElaSw D8knw398WXADf4CtJ01TJ6idaYrbQjVKbSO12K53G/C8kjn2Bm+LCMqxHpsnlUs4 7JGsv+8ZXXMru6MFQgwWe1NsXBznqK7F0LNt0EKj9E6CgD45ebig3+AmOA5REayT 15ikx6e3NZA4md+doe9JGKw9PefTuZzqsS0xI3xVySqmF+CPhRl0KkEGPmpsb6sB TpEKuECvdZO1xNLdgu+kPLUtkyELgztTz+IfpLRdlu5QM/KQBz6WGrxpXN1u+B7A dpDKp5Z0sdngBiqaI9/L52uZVAVoz7BAuzasWt5fwEbunk9m2pdP8q7uWatdJmUA mXT+kszAuKYP/Q7d1JZlLxH0efYrvPMx9lBW8H4//1pEzS63gaa0Lc/gxXnIgLOc 9sUfQoHpS8bZCKJ0wwJzSNev+oQif/TuINRikV4PFHG05uoLq+0s+fNxlJTX3Nxr oi2l5StzLnc3myU3oH+5HqJIpo02uSiolIIlrq7Mvug3+nOop8YADqy9fSiNOpuG Sq6sceFh0ojEBAEBCAAuFiEE3Si95tmHXKvOSosd3M8NswvBBUgFAmNO/MQQHGFy bmVfYmFiQHdlYi5kZQAKCRDczw2zC8EFSIHXBACRkTgvGTDC2pivT9JhPyi13+5p QEpAMgU5BnGBLsP5CnBGzLS1byltgaWa7yIKUXhOc8yN7mkxcTIAreyUY19W5Yex 0Galt04wF+hxMcpyS5mUt9UR0oX6RANef+hxt2G6DimFyXB2sPyWu5qZsbqo1jtk RNmEEOAfdzbaYW4zXA== =yMbp -----END PGP SIGNATURE----- --=-=-=--