From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.devel Subject: Re: gratuitous changes Date: 10 Feb 2003 10:47:53 +0900 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: References: <200301312148.h0VLmG128712@rum.cs.yale.edu> <87el6kyyru.fsf@pot.cnuce.cnr.it> Reply-To: Miles Bader NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: main.gmane.org 1044841638 29136 80.91.224.249 (10 Feb 2003 01:47:18 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Mon, 10 Feb 2003 01:47:18 +0000 (UTC) Cc: Stefan Monnier Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 18i32S-0007Zn-00 for ; Mon, 10 Feb 2003 02:47:16 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 18i3DE-0006eu-00 for ; Mon, 10 Feb 2003 02:58:24 +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 18i33l-0004Cj-04 for emacs-devel@quimby.gnus.org; Sun, 09 Feb 2003 20:48:37 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10.13) id 18i33Q-00048t-00 for emacs-devel@gnu.org; Sun, 09 Feb 2003 20:48:16 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10.13) id 18i33O-00045c-00 for emacs-devel@gnu.org; Sun, 09 Feb 2003 20:48:14 -0500 Original-Received: from tyo201.gate.nec.co.jp ([210.143.35.51]) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 18i33N-00044B-00; Sun, 09 Feb 2003 20:48:13 -0500 Original-Received: from mailgate4.nec.co.jp ([10.7.69.193])h1A1m3w06209; Mon, 10 Feb 2003 10:48:04 +0900 (JST) Original-Received: from mailsv4.nec.co.jp (mailgate52.nec.co.jp [10.7.69.191]) by mailgate4.nec.co.jp (8.11.6/3.7W-MAILGATE-NEC) with ESMTP id h1A1m2o12147; Mon, 10 Feb 2003 10:48:02 +0900 (JST) Original-Received: from mcsss2.ucom.lsi.nec.co.jp ([10.30.114.133]) by mailsv4.nec.co.jp (8.11.6/3.7W-MAILSV4-NEC) with ESMTP id h1A1lsH28201; Mon, 10 Feb 2003 10:48:01 +0900 (JST) Original-Received: from mcspd15.ucom.lsi.nec.co.jp (mcspd15 [10.30.114.174]) id h1A1lrB16275; Mon, 10 Feb 2003 10:47:53 +0900 (JST) Original-Received: by mcspd15.ucom.lsi.nec.co.jp (Postfix, from userid 31295) id 9AB0537BE; Mon, 10 Feb 2003 10:47:53 +0900 (JST) Original-To: Francesco Potorti` System-Type: i686-pc-linux-gnu Blat: Foop In-Reply-To: <87el6kyyru.fsf@pot.cnuce.cnr.it> Original-Lines: 16 Original-cc: emacs-devel@gnu.org 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:11524 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:11524 Francesco Potorti` writes: > And I always call diff with the -b option. > > The latter should avoid all problems you mention when merging > differences. Um, no. `diff -b' is only appropriate when generating patches for humans to look at*, not for merging (and things like CVS don't allow such behavior anyway). * and even then, it's not always appropriate -- sometimes you _want_ to see indentation changes or whatever -Miles -- Quidquid latine dictum sit, altum viditur.