Problems generating CVS patch

[se...@verizon.net]

Greetings,

I am trying to create a CVS patch.  I'm using JBuilder X and Tortoise CVS on 
Windows XP.  As a test I modified a single existing line of code in JBuilder 
and saved.  My format settings in JBuilder were set to "preserve current 
line endings within files."  When I generate the patch file in CVS it 
contains a ton of changes to lines that I did not change.

An example is the beginning of the patch file shows:

/*
* Copyright 2002-2004 The Apache Software Foundation.
- *
+ *

It would seem this might have something to do with the line breaks.  I have 
tried RTFM as well as googling everywhere and cannot figure out what's going 
on.  Please help!  I'd like to contribute something without my patch 
screwing up the formatting, etc.of the source files.

Thanks,

sean 



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org

Re: Problems generating CVS patch

[Sean Schofield <se...@schof.com>]

Dennis,

Thanks for the response.  I figured out the problem and it was indeed the 
trailing whitespace as you had mentioned.  There is a setting for it.  Oddly 
enough its not set at the project level but at the editor level (a save 
option).  Once I changed the setting I was fine.

Thanks.

----- Original Message ----- 
From: "Dennis Lundberg" <de...@mdh.se>
To: "Jakarta Commons Developers List" <co...@jakarta.apache.org>
Sent: Saturday, September 11, 2004 6:50 PM
Subject: Re: Problems generating CVS patch


> Hi Sean
>
> I think that JBuilder is stripping trailing blanks for you. In IntelliJ 
> IDEA that I use there is a setting for this. There should be one in 
> JBuilder as well.
>
> I ran into this myself a while ago. One solution, if you can't find a 
> switch in JBuilder, is to change the cvs command slightly. Instead of 
> doing
>   cvs diff -u filename
> you do
>   cvs diff -uwb filename
>
> --
> Dennis Lundberg



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org

Re: Problems generating CVS patch

[Dennis Lundberg <de...@mdh.se>]

Hi Sean

I think that JBuilder is stripping trailing blanks for you. In IntelliJ 
IDEA that I use there is a setting for this. There should be one in 
JBuilder as well.

I ran into this myself a while ago. One solution, if you can't find a 
switch in JBuilder, is to change the cvs command slightly. Instead of doing
   cvs diff -u filename
you do
   cvs diff -uwb filename

--
Dennis Lundberg

sean.schofield@verizon.net wrote:
> Greetings,
> 
> I am trying to create a CVS patch.  I'm using JBuilder X and Tortoise 
> CVS on Windows XP.  As a test I modified a single existing line of code 
> in JBuilder and saved.  My format settings in JBuilder were set to 
> "preserve current line endings within files."  When I generate the patch 
> file in CVS it contains a ton of changes to lines that I did not change.
> 
> An example is the beginning of the patch file shows:
> 
> /*
> * Copyright 2002-2004 The Apache Software Foundation.
> - *
> + *
> 
> It would seem this might have something to do with the line breaks.  I 
> have tried RTFM as well as googling everywhere and cannot figure out 
> what's going on.  Please help!  I'd like to contribute something without 
> my patch screwing up the formatting, etc.of the source files.
> 
> Thanks,
> 
> sean
> 
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: commons-dev-help@jakarta.apache.org
> 


---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org