From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Robert Anderson Newsgroups: gmane.emacs.devel Subject: Re: gratuitous changes Date: 31 Jan 2003 22:51:29 -0800 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <1044082289.14974.15.camel@lan1> References: <200301312148.h0VLmG128712@rum.cs.yale.edu> <20030131235443.F7B7.LEKTU@terra.es> <200302010000.h1100nF29021@rum.cs.yale.edu> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit X-Trace: main.gmane.org 1044082120 1440 80.91.224.249 (1 Feb 2003 06:48:40 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Sat, 1 Feb 2003 06:48:40 +0000 (UTC) Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 18erSA-0000N5-00 for ; Sat, 01 Feb 2003 07:48:38 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 18erYf-00018X-00 for ; Sat, 01 Feb 2003 07:55:21 +0100 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 18erTS-0005Po-06 for emacs-devel@quimby.gnus.org; Sat, 01 Feb 2003 01:49:58 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10.13) id 18erSv-0004V2-00 for emacs-devel@gnu.org; Sat, 01 Feb 2003 01:49:25 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10.13) id 18erSh-0003nI-00 for emacs-devel@gnu.org; Sat, 01 Feb 2003 01:49:14 -0500 Original-Received: from adsl-63-207-14-122.dsl.snfc21.pacbell.net ([63.207.14.122] helo=localhost.localdomain) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 18erSR-0002u0-00 for emacs-devel@gnu.org; Sat, 01 Feb 2003 01:48:55 -0500 Original-Received: from lan1 (lan1 [127.0.0.1]) by localhost.localdomain (8.12.5/8.12.5) with ESMTP id h116pTH4015392 for ; Fri, 31 Jan 2003 22:51:29 -0800 Original-To: emacs-devel@gnu.org In-Reply-To: <200302010000.h1100nF29021@rum.cs.yale.edu> X-Mailer: Ximian Evolution 1.0.8 (1.0.8-10) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: Emacs development discussions. List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:11272 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:11272 On Fri, 2003-01-31 at 16:00, Stefan Monnier wrote: > I'm not necessarily opposed to stripping all whitespace-only > line, but then let's do it once and for all in a single commit Right. > so even though it will fuck up `cvs diff' output, I will diff -w > at least know how I can trivially resolve all the conflicts. > > > Stefan "about 200 locally modified files" In case of emergency, you can write a few-line script to use diff -w and patch to get the effect of a whitespace insensitive merge. But, I agree that automatic, en masse whitespace changes should be done all at once, or not at all. If you guys can settle on a policy, I can make "whitespace orthodox" an automated test. Bob PS. You need a branch about 190 files ago. :)