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?Fwd=3A_=5BPATCH=5D_Don=E2=80=99t_run_smerge_multiple_times?= Date: Tue, 17 Mar 2020 20:07:25 -0400 Message-ID: References: Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="000000000000fa38e805a115d6ef" Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="97668"; 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 Wed Mar 18 01:08:48 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 1jEMGN-000PKi-Rx for ged-emacs-devel@m.gmane-mx.org; Wed, 18 Mar 2020 01:08:47 +0100 Original-Received: from localhost ([::1]:43448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEMGM-0001eO-U9 for ged-emacs-devel@m.gmane-mx.org; Tue, 17 Mar 2020 20:08:46 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:36317) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEMFH-0000i4-Io for emacs-devel@gnu.org; Tue, 17 Mar 2020 20:07:40 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEMFG-0005R3-7V for emacs-devel@gnu.org; Tue, 17 Mar 2020 20:07:39 -0400 Original-Received: from mail-io1-xd30.google.com ([2607:f8b0:4864:20::d30]:34144) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jEMFG-0005I1-1d for emacs-devel@gnu.org; Tue, 17 Mar 2020 20:07:38 -0400 Original-Received: by mail-io1-xd30.google.com with SMTP id h131so23147205iof.1 for ; Tue, 17 Mar 2020 17:07:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=mw2/WpNEkebgt5gpC5iNJ9B/2RH8C7vw47OctNLILAE=; b=liSstrl/RyYy38D2D0PBWdjSgelyxoGLazJRINXAHyg9F3/suB5/tla5bzEi7wt/yc nYRHMTusrGK78Ugt9twMkua8FCJyg6fY+2csoEsZL66bQ6TjiautIeZ7EhPR8rcNIYCH k+mg2jAume9l6xtIhd+a/tBNj+yrHuCiizgpUrCtXMW/v1fHTOLRahhfzuGz1+qx3V5l d0BtF7oQITXvhqReNiWgSY8xT2ryCVUfJyKV9h10wuYyx7ZUCmWNEEbOUcj/43mx7J2q KaEe4QrxpaRHTr8stDvlyyofZpf6cCgsnKr+sm+9k+z3bepHXWYLYnHbvTfkZ24eGppo WkhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=mw2/WpNEkebgt5gpC5iNJ9B/2RH8C7vw47OctNLILAE=; b=by9RD3ZBbI88B1NNdoqdpjTdaxEYfgLeBHSqES61zKV8uSP8ZqDJZ7ICr9GSutj1j5 ZbFPaZEWB6yTbIRQUTReBn+LVEyfKLjvuYi+NMfmn6OqhWfutAsqAPaZgMIDW0XtPlXk u9nDGcUST+wGzBkqR2a9jSjkEMR7kM/YaemxEQuw0VdXcTXrAdezCDzCsHhpg//rTiEv 8VhbrDpl27xcFxhzJ/R7vqQsbTG3AVBLuxGBLqj/AevKTVsauIumFtV/eQMS+FZxhrmq pGEAxamnod5oqC3DTubNTufSc5yrGYZTRha78fOMse9y3X0tsObBHsoj8qkeYq3f2+91 1YIA== X-Gm-Message-State: ANhLgQ2ECcML5TqNZfmTShFfjir0D2umZT9vkD41ajvKC4hCegsS8n7D t9pgEW0s1LwlHXVdWCYi+3BTCvRIbwyZ7NfN8/NFYA== X-Google-Smtp-Source: ADFU+vvN5cCUYNky7fCCZ30DBpkuhI1cBUqG9P+bed1pj231et/hs+E2IRYejwcnhqSbw51wbGyTFtJReF9K0Cr1KdE= X-Received: by 2002:a5d:945a:: with SMTP id x26mr1304513ior.120.1584490056659; Tue, 17 Mar 2020 17:07:36 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::d30 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:245567 Archived-At: --000000000000fa38e805a115d6ef Content-Type: text/plain; charset="UTF-8" Sorry for the late reply - just started going through forgotten emails. >> autorevert ends up calling vc-git-find-file-hook multiple times. > This sounds like a problem in itself. > Or is it really because the file gets modified multiple times? I think it is caused by each edit. At least the symptom is that after so much idle time, vc-git-find-file-hook gets run. Now that I'm looking for it, I don't actually see vc-git-find-file-hook is added to any hooks, so something seems off. It may be some kind of interaction with Magit that sets this up. > Tho now that I think about it, going to the next hunk sounds like a bad > idea when in the middle of an edit reagrdless of you were already in > smerge-mode. >> Related to >> https://lists.gnu.org/archive/html/emacs-devel/2015-10/msg02201.html > That patch was never installed. Has that problem been > fixed/circumvented some other way? It looks like it was fixed in https://debbugs.gnu.org/cgi/bugreport.cgi?bug=21559 in a different way. --000000000000fa38e805a115d6ef Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Sorry for the = late reply - just started going through forgotten emails.

>> a= utorevert ends up calling vc-git-find-file-hook multiple times.

>= This sounds like a problem in itself.
> Or is it really because the = file gets modified multiple times?

I think it is caused by each edit= . At least the symptom is that after so much idle time,
vc-git-find-fil= e-hook gets run. Now that I'm looking=C2=A0for it, I don't actually= see
vc-git-find-file-hook is added to any hooks, so something se= ems off. It may be some
kind of interaction with Magit that sets = this up.

> Tho now that I think about it, going to the nex= t hunk sounds like a bad
> idea when in the middle of an edit reagrdl= ess of you were already in
> smerge-mode.

>> Related to<= br>>> https://lists.gnu.org/archive/html/emac= s-devel/2015-10/msg02201.html

> That patch was never installe= d.=C2=A0 Has that problem been
> fixed/circumvented some other way?
It looks like it was fixed in=C2=A0https://debbu= gs.gnu.org/cgi/bugreport.cgi?bug=3D21559=C2=A0in a different way.
=

--000000000000fa38e805a115d6ef--