Date: Wed, 23 Nov 2005 04:57:47 -0700 (MST)
Wrom: UZXUWLSZLKBRNVWWCUFPEGAUTFJMVRESKPNKMBIPBARHDMNNSKVFVWRKJVZC
Subject: Warning: could not send message for past 4 hours
To: Jiri.Kovalsky@Sun.COM
Message-id: <200511231157.jAMGU0Tf023140@brmea-mail-3.sun.com>
Auto-submitted: auto-generated (warning-timeout)
MIME-version: 1.0
Content-type: multipart/report; report-type=delivery-status;
 boundary="Boundary_(ID_dfxwEF5Mo7FBTArnNMLBJg)"
Original-recipient: rfc822;jk110465@bohemia2-mail1.Czech.Sun.COM

This is a MIME-encapsulated message

--Boundary_(ID_dfxwEF5Mo7FBTArnNMLBJg)
Content-type: TEXT/PLAIN

    **********************************************
    **      THIS IS A WARNING MESSAGE ONLY      **
    **  YOU DO NOT NEED TO RESEND YOUR MESSAGE  **
    **********************************************

The original message was received at Tue, 22 Nov 2005 02:51:30 -0700 (MST)
from [129.157.72.190]

   ----- Transcript of session follows -----
221 2.0.0 asmx1.sfo.collab.net closing connection

<nbusers@netbeans.org>... Deferred
Warning: message still undelivered after 4 hours
Will keep trying until message is 3 days old

--Boundary_(ID_dfxwEF5Mo7FBTArnNMLBJg)
Content-type: message/delivery-status

Original-Envelope-Id: 0IQC00KAKOPT5N@bohemia2-mail1.czech.sun.com
Reporting-MTA: dns; brmea-mail-3.sun.com
Arrival-Date: Tue, 22 Nov 2005 02:51:30 -0700 (MST)

Final-Recipient: RFC822; nbusers@netbeans.org
Action: delayed
Status: 4.4.2
Last-Attempt-Date: Wed, 23 Nov 2005 04:57:47 -0700 (MST)
Will-Retry-Until: Fri, 25 Nov 2005 02:51:30 -0700 (MST)

--Boundary_(ID_dfxwEF5Mo7FBTArnNMLBJg)
Content-type: message/rfc822

Return-path: <Jiri.Kovalsky@sun.com>
Received: from phys-bohemia2-2 ([129.157.72.190])
	by brmea-mail-3.sun.com (8.12.10/8.12.9) with ESMTP id jAM9pT3F016929	for
 <nbusers@netbeans.org>; Tue, 22 Nov 2005 02:51:30 -0700 (MST)
Received: from conversion-daemon.bohemia2-mail1.czech.sun.com by
 bohemia2-mail1.czech.sun.com
 (iPlanet Messaging Server 5.2 HotFix 1.24 (built Dec 19 2003))
 id <0IQC00K01OE55N@bohemia2-mail1.czech.sun.com>
 (original mail from Jiri.Kovalsky@Sun.COM) for nbusers@netbeans.org; Tue,
 22 Nov 2005 10:51:29 +0100 (CET)
Received: from sun.com (vpn-129-150-112-140.Holland.Sun.COM [129.150.112.140])
 by bohemia2-mail1.czech.sun.com
 (iPlanet Messaging Server 5.2 HotFix 1.24 (built Dec 19 2003))
 with ESMTP id <0IQC0063WOPTSN@bohemia2-mail1.czech.sun.com> for
 nbusers@netbeans.org; Tue, 22 Nov 2005 10:51:29 +0100 (CET)
Date: Tue, 22 Nov 2005 10:51:32 +0100
Wrom: MHVIBGDADRZFSQHYUCDDJBLVLMHAALPTCXLYR
Subject: Re: [nbusers] ignoring whitespace and line breaks with CVS  on NB5beta2
In-reply-to: <F954F65B589CB44390E3F38D59CFFB8313D710@irnts85.ifp.fr>
To: nbusers@netbeans.org
Message-id: <4382EA24.7010105@sun.com>
MIME-version: 1.0
Content-type: text/plain; charset=us-ascii; format=flowed
Content-transfer-encoding: 7BIT
X-Accept-Language: en-us, en
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.6)
 Gecko/20040113
References: <F954F65B589CB44390E3F38D59CFFB8313D710@irnts85.ifp.fr>

Hello Yann,

   I have good news for you. The option to ignore whitespaces in diffs was implemented recently however it's not present in Beta 2 yet. If you download the latest daily development build it's already there:

   http://www.netbeans.info/downloads/download.php?a=n&p=1

The setting is turned on by default but if you want to turn it off do the following:

1. Invoke "Tools|Options" from main menu.
2. Press "Advanced Options" button.
3. Expand "IDE Configuration|Server and External Tool Settings|Diff and Merge Types|Diff Engines" nodes.
4. Select "Built-in Diff Engine" node.
5. The "Ignore Whitespaces" setting will appear in the right pane.

Hope this helps,
-Jirka

GAUTIER Yann wrote:

>  Hello,
> 
> I would like to find a way to tell cvs to ignore white spaces and line
> breaks when I perform a diff between two versions of a file. That issue
> becomes quite important since I am working on a project that is developed
> both on windows and on Linux. I have to use an external tool (tkcvs for
> instance or pcl-cvs on xemacs) to diff my files. Is there a way to tell
> netbeans to highlight only differences that are relevant ?
> Thanks
> 
> Yann Gautier

--Boundary_(ID_dfxwEF5Mo7FBTArnNMLBJg)--