commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Al Chou <hotfusion...@yahoo.com>
Subject Re: [math] Re: DO NOT REPLY [Bug 21023] - [PATCH] [math] Natural spline interpolation
Date Wed, 25 Jun 2003 04:32:54 GMT
--- "Mark R. Diggory" <mdiggory@latte.harvard.edu> wrote:
> 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?

Yeah, that's a jEdit backup file (I have it set to save up to 10 previous
versions, hence the ~N~ notation rather than the single ~ you'd get from Emacs
or Vim).


> 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.

I'll make sure to do that sort of thing in the future when necessary.



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


Mime
View raw message