From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eric Abrahamsen Newsgroups: gmane.emacs.devel Subject: Re: Emacs-diffs Digest, Vol 175, Issue 8 Date: Thu, 01 Jun 2017 23:01:56 +0800 Message-ID: <87tw3zycnv.fsf@ericabrahamsen.net> References: <83o9u7dbsh.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1496361723 10200 195.159.176.226 (2 Jun 2017 00:02:03 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 2 Jun 2017 00:02:03 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jun 02 02:01:57 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 1dGa2P-0002NG-QR for ged-emacs-devel@m.gmane.org; Fri, 02 Jun 2017 02:01:57 +0200 Original-Received: from localhost ([::1]:47169 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGa2V-0006Kb-50 for ged-emacs-devel@m.gmane.org; Thu, 01 Jun 2017 20:02:03 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60094) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGa2O-0006KU-Go for emacs-devel@gnu.org; Thu, 01 Jun 2017 20:01:57 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dGa2K-0001PQ-LJ for emacs-devel@gnu.org; Thu, 01 Jun 2017 20:01:56 -0400 Original-Received: from [195.159.176.226] (port=46730 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dGa2K-0001Mb-Ew for emacs-devel@gnu.org; Thu, 01 Jun 2017 20:01:52 -0400 Original-Received: from list by blaine.gmane.org with local (Exim 4.84_2) (envelope-from ) id 1dGa29-0001cV-F0 for emacs-devel@gnu.org; Fri, 02 Jun 2017 02:01:41 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 51 Original-X-Complaints-To: usenet@blaine.gmane.org Cancel-Lock: sha1:kwOvB2CUi+u0kp26LuzLzY2WRe0= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 195.159.176.226 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:215388 Archived-At: Eli Zaretskii writes: >> From: emacs-diffs-request@gnu.org >> Date: Thu, 01 Jun 2017 03:50:45 -0400 >> >> From: eric@ericabrahamsen.net (Eric Abrahamsen) >> To: emacs-diffs@gnu.org >> Date: Thu, 1 Jun 2017 03:50:19 -0400 (EDT) >> Subject: [Emacs-diffs] scratch/gnus-search a80b6f9 02/30: Rename nnir.el to >> gnus-search.el >> Message: 1 >> >> branch: scratch/gnus-search >> commit a80b6f9da4d739c91d26c8c944c3b95ac87eac8a >> Author: Eric Abrahamsen >> Commit: Eric Abrahamsen >> >> Rename nnir.el to gnus-search.el > > Is this renaming really necessary? If it isn't, I'd prefer not to > rename, as doing so makes digging into history harder. When all the dust has cleared on these edits, gnus-search.el won't really have much to do with the original nnir.el, not to the point where you'd be interested in following code evolution from one file to the next. The "rename" commit message was more a note-to-self intermediate step. (Possibly extraneous background: half of the original nnir.el file is getting moved into a new Gnus backend in nnselect.el, the remaining half is mostly rewritten, and the "nnir" designation no longer makes any sense. In fact, more actual code survives in nnir.el-->nnselect.el than survived nnir.el-->gnus-search.el.) This actually leads to a question that I was going to ask later: with a fairly hefty change like this, how should the code be later merged into master? It doesn't really make sense as a multi-commit patch-set, because the whole thing basically got tossed out and re-written. There is no viable "intermediate state", it's pretty much monolithic. My feeling is that, eventually, it might make most sense to merge with --squash and just do a fairly hefty commit message. If that happens, the "rename" would just disappear: nnir.el would go away, and be replaced by a combination of nnselect.el and gnus-search.el. WDYT? Anyway, I agree with Ted's suggestion that scratch branches maybe shouldn't trigger emacs-diffs notifications! Eric