From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: joaotavora@gmail.com (=?utf-8?B?Sm/Do28gVMOhdm9yYQ==?=) Newsgroups: gmane.emacs.devel Subject: Re: Emacs 26.1 release branch created Date: Fri, 29 Sep 2017 18:04:03 +0100 Message-ID: <87d169tp18.fsf@gmail.com> References: <83377mls4d.fsf@gnu.org> <87a81g813i.fsf@lolita> <83vak17bn7.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1506705482 32727 195.159.176.226 (29 Sep 2017 17:18:02 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 29 Sep 2017 17:18:02 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.60 (gnu/linux) Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Sep 29 19:17:56 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dxyv2-00072Z-WE for ged-emacs-devel@m.gmane.org; Fri, 29 Sep 2017 19:17:45 +0200 Original-Received: from localhost ([::1]:36304 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dxyvA-0002bp-FR for ged-emacs-devel@m.gmane.org; Fri, 29 Sep 2017 13:17:52 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49407) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dxyhz-0000tT-6I for emacs-devel@gnu.org; Fri, 29 Sep 2017 13:04:16 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dxyhu-0001TX-V3 for emacs-devel@gnu.org; Fri, 29 Sep 2017 13:04:15 -0400 Original-Received: from mail-wr0-x22d.google.com ([2a00:1450:400c:c0c::22d]:46030) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dxyhu-0001SS-OE; Fri, 29 Sep 2017 13:04:10 -0400 Original-Received: by mail-wr0-x22d.google.com with SMTP id m18so171496wrm.2; Fri, 29 Sep 2017 10:04:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=raAgyBi01o6tsj5Lh1r9lpYMuuXFcF0UkIKZ7mGJmC8=; b=XZ87dz1F/I3zSGxLjCW0mlV3vMaWuibHLKlr48aFPVsLcL7BC3LDxvWBWRqyq8MF7w h2tuKW+0RTB9rGfO5Raql1uwqVzlJwPq8oKM4Vo2Rke8ms3ZBnvoXlPEZ00kHHG5EmD5 P0+aqu10Zlr6r+5JOTMXxI2ayadD6y+J8438IFctJm5Wr0Puf9npw90ioiteLQi4Z43R UWypunlLVYmDSernBGKMRtCi4izTjmg1W50MW5fU5Jnsc85tiFgeoSqrlbXWWH2LcKXP VPBpxs1GdhACQ7AmGUwht1zOz16isnKsWFlg3cUa4yHy7RDpNXmEq14bROlGfmiKDyX1 IEtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=raAgyBi01o6tsj5Lh1r9lpYMuuXFcF0UkIKZ7mGJmC8=; b=E/kN0oDz4b43t1sfv1uofUf29RySGkM0v6TAujF1uGlRCFKEM8d5475UzjefWsG7XU X/TcJcMlIAuMH7wDjMTNQBkdN95Q6zyBvw2OkG7daqN/ZoMRkcF1D4F90Y6wI7zL+OKK zZd9NgMDXZwwbrdB2BL+6ltENhqcIlLCaIlOseUVCU3b2grVzO1q0JjnLwWYpXGhRKL5 Ctai9QdY5aGNfXwXvd3H06aOGHY5FukfPxnQIFdtrx4lz6hiKunZwiMgk8M37t+44ZPy gZoAghfJlGJJoerLrqiukXpevRLDEcaywPj7I+42Qsmjy4L6v41hVUoex18IMs1qBJ4t Z3bQ== X-Gm-Message-State: AMCzsaXIustCOD32G8MKwJoD3BG8xIlNdiJGx0cZS+74Bsb4NInB9/T5 U7M1Rw/81dDbXDg/5x+98BxfUMDk X-Google-Smtp-Source: AOwi7QALpoJEyKwnG8vptjREHwvehZ5MnXRYHrKM0s9sIuvJK13XxRnnBgYp5lRfGIdWhLuFGNI72Q== X-Received: by 10.223.187.201 with SMTP id z9mr1921666wrg.195.1506704646984; Fri, 29 Sep 2017 10:04:06 -0700 (PDT) Original-Received: from lolita.yourcompany.com ([194.117.2.109]) by smtp.gmail.com with ESMTPSA id c56sm4748554wrc.1.2017.09.29.10.04.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Sep 2017 10:04:06 -0700 (PDT) In-Reply-To: <83vak17bn7.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 29 Sep 2017 18:44:12 +0300") X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22d X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:218918 Archived-At: Eli Zaretskii writes: > I'm confused: why are there parts of this work on emacs-26, and other > parts on a scratch branch? Sorry, I'm afraid this isn't easy to understand, though I believe John has already and the matter is solved. Let me try again. As I explained in the part that you cut out: >> More than a month ago, I asked here whether this work, that I >> prematurely and mistankenly pushed to the then-master branch in error, >> should be reverted. These are the two commits that I prematurely pushed to what was then master: * 13993c46a2..: Jo=C3=A3o T=C3=A1vora 2017-08-17 Add flymake-backends defcu= stom * eb34f7f5a2..: Jo=C3=A3o T=C3=A1vora 2017-08-17 Split flymake.el into flym= ake-proc.el and flymake-ui.el Some days later, on Aug. 21, I noticed the mistake and wrote here (https://lists.gnu.org/archive/html/emacs-devel/2017-08/msg00460.html) >> Unfortunately, I seemed to have jumped the gun and inadvertently >> pushed these commits into master instead of keeping them in the >> scratch/flymake-refactor branch until I got some reviews, which >> naturally was my intention. Sorry about that. >> [... They don't break >> anything, but] since they were pushed in error, I can revert them if >> someone feels that's necessary. The only reply that I got to this was Stefan's, on Aug. 22 who said the work was going "in the right direction", so I shouldn't revert it. And I didn't. In the meantime I was sidetracked and you created emacs-26. So this is why there is (rather "was", read below) this half-baked, going-in-the-right-direction work on the emacs-26. So a few days ago, the work was in both emacs-26 and on master. Following John's opinion in this thread (and my first choice) I reverted it on emacs-26 and marked it "don't merge". I took care that this reversion kept minor bugfixes by Paul and Sam commited on top of it in the meantime. The 'git revert' commits are: * ce540f8a68..: Jo=C3=A3o T=C3=A1vora 2017-09-27 Revert "Split flymake.el i= nto flymake-proc.el and flymake-ui.el" * 7cf59c6635..: Jo=C3=A3o T=C3=A1vora 2017-09-27 Revert "Add flymake-backen= ds defcustom" Besides the title, the commit messages also explain the situation in detail. So now, the half-baked work is only on master. > Does the latter continue where the former > left off? or is it an entirely different code? It continues where the former left off, but very heavily expands on it, and changes some early design decisions. > Also, how long (calendar-wise) do you envision it to take you to get > to the point where the code is not "half-baked"? The code is 90% baked right now. I requested comments yesterday, and Stefan's review (in the "Flymake refactored" thread in this list) was very speedy and very productive (naturally I would very much appreciate other opinions). I'm more than halfway through integrating Stefan's suggestions, and none seem very controversial. I'm very interested in getting this onto master ASAP, since I have other pressing matters to attend to. If you are considering opening an exception and letting it go to emacs-26, I have this to say: the code is stable in my testing, backwards compatible to both user and third-party lisp (with few exceptions that I can detail). I have expanded the automated test coverage quite a bit, fixed longstanding bugs, and also started rewriting the documentation. So I'd say: * "one week" to master (where, AFAIU, doc and NEWS aren't showstoppers) * "three weeks" to emacs-26 (NEWS, doc and polishing) Obviously, less if someone helps out. Jo=C3=A3o