on 5/11/01 1:44 PM, "Henning P. Schmiedehausen" <[EMAIL PROTECTED]>
wrote:

> --- jakarta-turbine.orig/src/java/org/apache/turbine/util/db/Criteria.java
Thu 
> May 10 19:00:30 2001
> +++ jakarta-turbine/src/java/org/apache/turbine/util/db/Criteria.java    Fri
May 
> 11 22:33:20 2001
> @@ -93,6 +93,7 @@
> * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
> * @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
> * @author <a href="mailto:[EMAIL PROTECTED]";>Eric Dobbs</a>
> + * @author <a href="mailto:[EMAIL PROTECTED]";>Henning P. Schmiedehausen</a>
> * @version $Id: Criteria.java,v 1.30 2001/05/06 17:06:41 jvanzyl Exp $
> */
> public class Criteria extends Hashtable
> @@ -416,10 +417,31 @@
>        return new Criterion(table,column,value,comparison);
>    }
> 

Ug. This patch doesn't apply cleanly because it isn't against the latest CVS
version which is 1.33...

patch < patch.foo  
can't find file to patch at input line 3
Perhaps you should have used the -p or --strip option?
The text leading up to this was:
--------------------------
|--- jakarta-turbine.orig/src/java/org/apache/turbine/util/db/Criteria.java
T
hu May 10 19:00:30 2001
|+++ jakarta-turbine/src/java/org/apache/turbine/util/db/Criteria.java  Fri
May 
11 22:33:20 2001   
--------------------------
File to patch: src/java/org/apache/turbine/util/db/Criteria.java
patching file src/java/org/apache/turbine/util/db/Criteria.java
Hunk #1 FAILED at 93.
Hunk #8 FAILED at 1490.
Hunk #11 FAILED at 1567.
patch unexpectedly ends in middle of line
Hunk #12 succeeded at 1880 with fuzz 1.
3 out of 12 hunks FAILED -- saving rejects to file
src/java/org/apache/turbine/util/db/Criteria.java.rej

-jon


-- 
If you come from a Perl or PHP background, JSP is a way to take
your pain to new levels. --Anonymous
<http://jakarta.apache.org/velocity/ymtd/ymtd.html>


---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to