From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Emacs-diffs Digest, Vol 175, Issue 8 Date: Fri, 02 Jun 2017 09:18:01 +0300 Message-ID: <83inkediau.fsf@gnu.org> References: <83o9u7dbsh.fsf@gnu.org> <87tw3zycnv.fsf@ericabrahamsen.net> Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1496384289 14356 195.159.176.226 (2 Jun 2017 06:18:09 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 2 Jun 2017 06:18:09 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eric Abrahamsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jun 02 08:18:05 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 1dGfuO-00037o-Sp for ged-emacs-devel@m.gmane.org; Fri, 02 Jun 2017 08:18:04 +0200 Original-Received: from localhost ([::1]:48052 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGfuN-0006jQ-Jd for ged-emacs-devel@m.gmane.org; Fri, 02 Jun 2017 02:18:03 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57092) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGfuC-0006hb-RJ for emacs-devel@gnu.org; Fri, 02 Jun 2017 02:17:53 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dGfu7-0007kF-Ta for emacs-devel@gnu.org; Fri, 02 Jun 2017 02:17:52 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:38625) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGfu7-0007k9-Q9; Fri, 02 Jun 2017 02:17:47 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:2975 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dGfu7-0007Bs-24; Fri, 02 Jun 2017 02:17:47 -0400 In-reply-to: <87tw3zycnv.fsf@ericabrahamsen.net> (message from Eric Abrahamsen on Thu, 01 Jun 2017 23:01:56 +0800) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e 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:215391 Archived-At: > From: Eric Abrahamsen > Date: Thu, 01 Jun 2017 23:01:56 +0800 > > >> 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. Ah, okay. In that case, the renaming really doesn't matter. Thanks for explaining this bit. > 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? My preference is for you to simply merge the branch onto master. This will leave all of your branch commits visible and bisect-able, so no information is lost. > My feeling is that, eventually, it might make most sense to merge with > --squash If you must. The disadvantage is that finding the problematic change by bisecting will be harder, if that change is part of the single jumbo commit. > and just do a fairly hefty commit message. How to make a commit message is a separate problem. I normally do that as a log message for the merge-commit (which by default is trivially generated by Git). You can also do that as the last commit on the branch, or, if some changes are needed after the merge, in the log message of those changes. In any case, I think this issue should not have any bearing on how to merge. Thanks.