From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Matthew Bauer Newsgroups: gmane.emacs.devel Subject: =?UTF-8?Q?=5BPATCH=5D_Don=E2=80=99t_run_smerge_multiple_times?= Date: Tue, 11 Feb 2020 13:55:48 -0500 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="000000000000110842059e5168a9" Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="107331"; mail-complaints-to="usenet@ciao.gmane.io" To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Feb 11 19:58:32 2020 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 1j1ajv-000RnZ-Ud for ged-emacs-devel@m.gmane-mx.org; Tue, 11 Feb 2020 19:58:31 +0100 Original-Received: from localhost ([::1]:56046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1aju-0006DF-WB for ged-emacs-devel@m.gmane-mx.org; Tue, 11 Feb 2020 13:58:31 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:38841) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1ahk-0004Pb-2Z for emacs-devel@gnu.org; Tue, 11 Feb 2020 13:56:17 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j1ahe-0004Wj-HF for emacs-devel@gnu.org; Tue, 11 Feb 2020 13:56:15 -0500 Original-Received: from mail-io1-xd34.google.com ([2607:f8b0:4864:20::d34]:42070) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j1ahb-0004PD-5d for emacs-devel@gnu.org; Tue, 11 Feb 2020 13:56:07 -0500 Original-Received: by mail-io1-xd34.google.com with SMTP id s6so12962288iol.9 for ; Tue, 11 Feb 2020 10:56:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=7upiar1ekcZykH//p55Sj9OS+WkwpOiHx4jC/gk/cjE=; b=E/1GOzHYBKYl4oYzU3hHnGC/+aM+7ul2zyjTeD6ysQxceyYOk8lhtbY0rqzEpXLOJ1 dxvWDJTzTGKnNocHpeLKO0q1aYf50/Q2kcb+ROsXsEJ7rLXxxGqRIO0kj57JsvRDLcMg OQSlQtC0fRwrmgMsj+rlyzEPJc3l1OwSAGhW3ajrXJpippahgMhDlhKp6OzgaxVkPbhI jc7jy9NIrLphQx551HEJLsh7w5eCrevAIOL4/G2ZvDJNXvxcQ78iJroxta7z3JgeXcye IMKEBNjPO45OmGgroOlRSohdkcNTCwavkxDArolrEDj+PrgmA4w+21p9POr7F7PJrHIJ gsew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=7upiar1ekcZykH//p55Sj9OS+WkwpOiHx4jC/gk/cjE=; b=htBBq1mLTm7nkb0qHM/TxFl+j4QbtyahyEivpUsGp6eZkKu2ENqLGvj2/MjN3IPpSB 6wZQkNgq971c2/kDdxHAbTOc10UuAZJdrXWB7+WTpNodbY6bdAv2JOdZAs846GzitWa6 jlvzxz71foRZTziRVGdLD9gvPRaZRHIEfmj68mwHbB+gMCQ+jO8QXENmT6BFBiiKunkk wfe211CQapJoIkYHOInf3jaZ5MZ7JiJ8pngO9vEhYy6/eK2BKbXmFCUHWsGTXJ30d9u6 ml4frViIc6l3kITfOyoMJK5Fh9iYsFhdDZNtTFMX4Y0fWEc5xPP6i3Y5MBybfrtw6E98 T2TA== X-Gm-Message-State: APjAAAXDy2mhIudiOdBO14IkRrAJChg3jxGrZvBwZk5d3GmWi3yvsquH u3e3jHKfYBQp4h81qWWFwf5z49cZGoKZHViQePV7bm+/ZYU= X-Google-Smtp-Source: APXvYqwuuJqrrRHGH5RsTNUzEqHfU5Uvpo53fXalA0mOKggQkgaUXo0aA4gHB9rezH9Vov9HgE4ASUMB9uU3Ty37/lk= X-Received: by 2002:a6b:398b:: with SMTP id g133mr14155685ioa.7.1581447359030; Tue, 11 Feb 2020 10:55:59 -0800 (PST) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::d34 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 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:244912 Archived-At: --000000000000110842059e5168a9 Content-Type: multipart/alternative; boundary="00000000000011083f059e5168a7" --00000000000011083f059e5168a7 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable autorevert ends up calling vc-git-find-file-hook multiple times. When this happens, smerge restarts and goes to the next hunk. This is not desired when in the middle of an edit. To fix, don=E2=80=99t start smerge w= hen smerge is already enabled. Related to https://lists.gnu.org/archive/html/emacs-devel/2015-10/msg02201.html Attached is a patch that avoids this bug. -Matthew --00000000000011083f059e5168a7 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
autorevert ends up calling vc-git-find-file-hook multiple = times. When
this happens, smerge restarts and goes to the next hunk. Thi= s is not
desired when in the middle of an edit. To fix, don=E2=80=99t st= art smerge when
smerge is already enabled.

Related to https= ://lists.gnu.org/archive/html/emacs-devel/2015-10/msg02201.html

Attached is a patch that avoids this bug.

-Matthew
--00000000000011083f059e5168a7-- --000000000000110842059e5168a9 Content-Type: text/x-patch; charset="UTF-8"; name="0001-Don-t-run-smerge-multiple-times.patch" Content-Disposition: attachment; filename="0001-Don-t-run-smerge-multiple-times.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k6i8wwq20 RnJvbSBmZjcwYWQwNTNjOTA3N2VmM2UwMTA0N2YwYWI4YWQzMDY3YTY2NjQ2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXR0aGV3IEJhdWVyIDxtamJhdWVyOTVAZ21haWwuY29tPgpE YXRlOiBUdWUsIDExIEZlYiAyMDIwIDEzOjQ5OjE3IC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gIERv buKAmXQgcnVuIHNtZXJnZSBtdWx0aXBsZSB0aW1lcwpNSU1FLVZlcnNpb246IDEuMApDb250ZW50 LVR5cGU6IHRleHQvcGxhaW47IGNoYXJzZXQ9VVRGLTgKQ29udGVudC1UcmFuc2Zlci1FbmNvZGlu ZzogOGJpdAoKYXV0b3JldmVydCBlbmRzIHVwIGNhbGxpbmcgdmMtZ2l0LWZpbmQtZmlsZS1ob29r IG11bHRpcGxlIHRpbWVzLiBXaGVuCnRoaXMgaGFwcGVucywgc21lcmdlIHJlc3RhcnRzIGFuZCBn b2VzIHRvIHRoZSBuZXh0IGh1bmsuIFRoaXMgaXMgbm90CmRlc2lyZWQgd2hlbiBpbiB0aGUgbWlk ZGxlIG9mIGFuIGVkaXQuIFRvIGZpeCwgZG9u4oCZdCBzdGFydCBzbWVyZ2Ugd2hlbgpzbWVyZ2Ug aXMgYWxyZWFkeSBlbmFibGVkLgoKUmVsYXRlZCB0byBodHRwczovL2xpc3RzLmdudS5vcmcvYXJj aGl2ZS9odG1sL2VtYWNzLWRldmVsLzIwMTUtMTAvbXNnMDIyMDEuaHRtbAotLS0KIGxpc3AvdmMv dmMtZ2l0LmVsIHwgMyArKy0KIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDEgZGVs ZXRpb24oLSkKCmRpZmYgLS1naXQgYS9saXNwL3ZjL3ZjLWdpdC5lbCBiL2xpc3AvdmMvdmMtZ2l0 LmVsCmluZGV4IDJjYWEyODdiY2UuLjdhNzA1MGExNGIgMTAwNjQ0Ci0tLSBhL2xpc3AvdmMvdmMt Z2l0LmVsCisrKyBiL2xpc3AvdmMvdmMtZ2l0LmVsCkBAIC0xMTA5LDggKzExMDksOCBAQCBUaGlz IHByb21wdHMgZm9yIGEgYnJhbmNoIHRvIG1lcmdlIGZyb20uIgogICAgICAgICAgICAgIChzYXZl LWV4Y3Vyc2lvbgogICAgICAgICAgICAgICAgKGdvdG8tY2hhciAocG9pbnQtbWluKSkKICAgICAg ICAgICAgICAgIChyZS1zZWFyY2gtZm9yd2FyZCAiXjw8PDw8PDwgIiBuaWwgJ25vZXJyb3IpKSkK LSAgICAoc21lcmdlLXN0YXJ0LXNlc3Npb24pCisgICAgKHVubGVzcyAoYW5kIChib3VuZHAgJ3Nt ZXJnZS1tb2RlKSBzbWVyZ2UtbW9kZSkKKyAgICAgIChzbWVyZ2Utc3RhcnQtc2Vzc2lvbikpCiAg ICAgKHdoZW4gdmMtZ2l0LXJlc29sdmUtY29uZmxpY3RzCiAgICAgICAoYWRkLWhvb2sgJ2FmdGVy LXNhdmUtaG9vayAndmMtZ2l0LXJlc29sdmUtd2hlbi1kb25lIG5pbCAnbG9jYWwpKQogICAgICh2 Yy1tZXNzYWdlLXVucmVzb2x2ZWQtY29uZmxpY3RzIGJ1ZmZlci1maWxlLW5hbWUpKSkKLS0KMi4y My4xCgo= --000000000000110842059e5168a9--