commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Mark R. Diggory" <mdigg...@latte.harvard.edu>
Subject Re: [math] Re: DO NOT REPLY [Bug 21023] - [PATCH] [math] Natural spline interpolation
Date Wed, 25 Jun 2003 03:56:33 GMT
Understandable, and thats sensible, as long as I can find a way to apply 
the patch, I'll accept it.

There is a way that the cvs diff strategy would still work, it would 
have been to create a cvs diff that applied all the changes that the tgz 
provided plus your changes. But, someone out there probably thinks that 
uncouth.

I don't know if this is something that can be altered with unix diff or 
not, the primary problem I always have applying your patches has to do 
with the diff header which usually looks something like this:

--- SplineInterpolator.java~1~	Mon Jun 23 07:41:18 2003
+++ SplineInterpolator.java	Mon Jun 23 20:31:07 2003
@@ -55,11 +55,12 @@

Maybe its an option or something I don't know about diff, but when I try 
to apply it I always get this "can't find SplineInterpolator.java~1~" 
file error. Which makes sense because there never really is one in the 
filesystem. Do you know where the ~1~ file comes from?

My usual solution for this is to cut, paste and edit a "cvs diff" 
generated header into the top of your file like this:

Index: SplineInterpolator.java
===================================================================
RCS file: 
/home/cvs/jakarta-commons-sandbox/math/src/java/org/apache/commons/math/SplineInterpolator.java,v
retrieving revision 1.1
diff -u -r1.1 SplineInterpolator.java
--- SplineInterpolator.java   Mon Jun 23 07:41:18 2003
+++ SplineInterpolator.java	Mon Jun 23 20:31:07 2003

then I can apply it the same way I do others.

-Mark

Al Chou wrote:
>>------- Additional Comments From mdiggory@latte.harvard.edu  2003-06-25 01:16
>>-------
>>I'll apply this, but its really alot easier to apply "cvs generated patches"
>>over tarballs or unix diff. I would prefer this format over all others.
>>
>>Not only does cvs diff generate patches directly against the cvs copies,
>>assuring your diffing against whats presently in the cvs, but you can also
>>add
>>files using it. In otherwords, if you create a file and the run cvs diff on
>>the
>>directory, when I apply the patch, the file will be created.
> 
> 
> Mark, I would have used cvs diff, but the file I was patching wasn't in CVS
> yet, so I had to patch the patch attached to the bug report.  I didn't want to
> wait until the original patch was committed and possibly forget to even propose
> my patch.
> 
> 
> Al
> 
> =====
> Albert Davidson Chou
> 
>     Get answers to Mac questions at http://www.Mac-Mgrs.org/ .
> 
> __________________________________
> Do you Yahoo!?
> SBC Yahoo! DSL - Now only $29.95 per month!
> http://sbc.yahoo.com
> 
> ---------------------------------------------------------------------
> 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


Mime
View raw message