From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: martin rudalics Newsgroups: gmane.emacs.devel Subject: Re: Problem committing tests Date: Mon, 29 May 2017 08:41:31 +0200 Message-ID: <592BC29B.6050507@gmx.at> References: <87wp90ppu7.fsf@rosalinde> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: blaine.gmane.org 1496040112 11067 195.159.176.226 (29 May 2017 06:41:52 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 29 May 2017 06:41:52 +0000 (UTC) To: Stephen Berman , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon May 29 08:41:48 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 1dFENA-0002k9-7Z for ged-emacs-devel@m.gmane.org; Mon, 29 May 2017 08:41:48 +0200 Original-Received: from localhost ([::1]:47114 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dFENF-0004mE-LV for ged-emacs-devel@m.gmane.org; Mon, 29 May 2017 02:41:53 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60392) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dFEN4-0004lx-Vb for emacs-devel@gnu.org; Mon, 29 May 2017 02:41:43 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dFEN1-00082L-Tk for emacs-devel@gnu.org; Mon, 29 May 2017 02:41:43 -0400 Original-Received: from mout.gmx.net ([212.227.17.20]:63716) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dFEN1-00082H-Iv for emacs-devel@gnu.org; Mon, 29 May 2017 02:41:39 -0400 Original-Received: from [192.168.1.100] ([212.95.7.5]) by mail.gmx.com (mrgmx103 [212.227.17.168]) with ESMTPSA (Nemesis) id 0Lp3Qu-1dtoO51vym-00ewnF; Mon, 29 May 2017 08:41:37 +0200 In-Reply-To: <87wp90ppu7.fsf@rosalinde> X-Provags-ID: V03:K0:NG00/oNQNG0Y7Ym+BxiM6RQOt+oUbXup3hXwUaFZXThUvBQMFYj REUdX39s+jEOU2yFMcyhcsLYDis4YOh4rTI47wFfN4G0ZUiN9FjfcTZXImz2gP6B7f3jl4Z J2Fj5mDTwEck+AnwzE2acArLBLArp3xfsyh/VaExOgd5MjZYoYt6tBLQAaUpJq7P/P3CFaW gkaFPm/5cCO33eE4dITsA== X-UI-Out-Filterresults: notjunk:1;V01:K0:iGYqmRUYFls=:sEpOKTQoHI9NjjfQospVGJ xJi0cwzCN3B+OM7U1HgunlyH6/H2No+e5hVX0s0px8pVLLOWYpXxFkb5rrsfkevHH27+xgJNT zwQ0vApMB1yNFc1XguK4SWZv8qczixCt/3u9NdLGFRvAHz4kPpviH0vP/pN5xLIfT3quldFa7 bQQ8KxQ9sBr94wAPyceR7MRjD5g796YgZGH+Ph1vpRyG4FTFvFF5hV4WYgrh7qUBxZbjqdPR1 v9mI4KnPoUxhwG8ChGZblClmk41ufmG5ZpDRVDu5eudEQVZd/5YIG9wY/5Bpkt+Njw40xgDO6 T3FALtmgKEDuw3bhTUwQPus1iWAbmr0hgL33MgErdXhSetPYWtK/d/WjgDshu5OG000AZywns 4JLoU9TZfU9R+z6zaAxOUAiisMGEXU9Lu0rmUZPZyaZAjESyj5DJrtHHIEumtEvpNsKMmzCUq VqsRosYJwX6j7gouLjxgLxV6XtfSrweJpKUe1+gI1eT4vVQ9OSFXcEwX0FAJ1DDFhXzFbfAHM hEvEd10Oepn4r6b5b/zf6hdWgYsAsBpmlK9ImeFxhNRLGGzpSIuWKCjlVa04RsRWED2xyqyVS Q9BXoHSRcgR6brPcRKLQmYWqurTOvyPvOit1qWervvySXtOSTd3Es1W+j/awiKOCootW+SDx5 z7OsiJCvGwFfhrHboV3xqL0izYJew+TxQ4X+ez6gqKZ/G5s2bvtBb9/pZYWLJG1hLOrvJPyQi oaPiEwTqgt+V/LyILz+4657qeiCmP1axvfQIkRsRdH8CQiEg1Eh5XZ5oi27Z0udPc6wFlgHq X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.20 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:215300 Archived-At: > I wanted to include some tests with the fix for bug#27121 that I just > committed to master (d76c007); however, git complained about trailing > whitespace in two data files for the tests. This whitespace is part of > the file format used by todo-mode.el, so I cannot delete it. I see that > the .gitattributes file in the repository lists several test files for > which whitespace warnings should be ignored; should I add the todo-mode > test data files to the list? Or is there another or better way to tell > git to ignore this whitespace and commit the files? Please do add the name of your file there. Unfortunately, this is not always done and so git doesn't commit here when resolving a conflict after a pull by telling me (as of last week) something like admin/unidata/Makefile.in:122: new blank line at EOF. and I have to locally commit -n. Someone proposed a fix for this but it apparently never made it to the repository. It's a pain because I tend to forget about this issue until I get bitten by it the next time ... martin