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: Trouble merging line-numbers branch into master Date: Sat, 08 Jul 2017 11:04:45 +0300 Message-ID: <83inj3l5gi.fsf@gnu.org> References: <20170707212353.GA2428@acm> <95b91e6b-c53e-c969-cda1-998803d301cc@cs.ucla.edu> Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1499501120 7358 195.159.176.226 (8 Jul 2017 08:05:20 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 8 Jul 2017 08:05:20 +0000 (UTC) Cc: acm@muc.de, eggert@cs.ucla.edu, emacs-devel@gnu.org To: Kaushal Modi Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jul 08 10:05:11 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 1dTkjk-00016l-7A for ged-emacs-devel@m.gmane.org; Sat, 08 Jul 2017 10:05:08 +0200 Original-Received: from localhost ([::1]:60262 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTkjl-0006PD-Ly for ged-emacs-devel@m.gmane.org; Sat, 08 Jul 2017 04:05:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47178) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTkje-0006Ow-NL for emacs-devel@gnu.org; Sat, 08 Jul 2017 04:05:03 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dTkja-00031B-NH for emacs-devel@gnu.org; Sat, 08 Jul 2017 04:05:02 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:37323) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTkja-000316-JX; Sat, 08 Jul 2017 04:04:58 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:1591 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dTkjX-0002ya-Fz; Sat, 08 Jul 2017 04:04:55 -0400 In-reply-to: (message from Kaushal Modi on Fri, 07 Jul 2017 21:46:44 +0000) 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:216307 Archived-At: > From: Kaushal Modi > Date: Fri, 07 Jul 2017 21:46:44 +0000 > Cc: Emacs developers > > On Fri, Jul 7, 2017 at 5:41 PM Paul Eggert wrote: > > Presumably the lines in question were changed in one branch or the other (not > necessarily by messing with white space), and our git settings are suggesting > that you omit the spaces before tabs while you're futzing with those lines. > > As build-aux/git-hooks/pre-commit suggests, you can work around the problem > temporarily with the shell command 'git config core.whitespace -trailing-space'. > I don't recommend this setting in general, though. > > I found the error useful. So when line-numbers branch is eventually merged, instead of ignoring/bypassing this > error, I'd suggest that that tab+space+tab combo be fixed and that whole thing be made to contain only tabs > or only spaces (my preference). I've just merged the branch, and didn't have any such problems. In the diffs I see no changes due to whitespace only, and the only merge conflict I had, in NEWS, had nothing to do with whitespace and was resolved without introducing any whitespace. So I really don't understand what is this all about. If SPC followed by a TAB is detected when you merge, it was already there in master before the merge, and the merge itself is not the problem. In any case, if someone bumps into this issue, please do NOT fix whitespace as part of very large commits (such as the one I just did), because in such jumbo changesets it's very important to be able to identify real changes, and too many whitespace changes get in the way. > Slowly and gradually, as more merges and commits happen in future, all such mixtures of tabs+spaces will > get removed. They cannot be removed completely, because indentation doesn't always end in a column whose number is an integral multiple of the tab width.