db-derby-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Mamta Satoor <msat...@gmail.com>
Subject Re: [PATCH} (DERBY-173) For the concurrency of ResultSet, Network Server should not send the concurrency of Statement.
Date Fri, 18 Mar 2005 15:21:44 GMT
On Sat, 12 Mar 2005 06:41:58 -0800, Kathey Marsden
<kmarsdenderby@sbcglobal.net> wrote:
> I am having some trouble applying this patch.
> $ patch -i ~/patches/derby173.txt
> patching file `java/drda/org/apache/derby/impl/drda/DRDAConnThread.java'
> patching file
> `java/testing/org/apache/derbyTesting/functionTests/tests/lang/updatableResultSet.java'
> Hunk #7 FAILED at 147.
> 1 out of 7 hunks FAILED -- saving rejects to
> java/testing/org/apache/derbyTesting/functionTests/tests/lang/updatableResultSet.java.rej
> missing header for unified diff at line 191 of patch
> can't find file to patch at input line 191
> Perhaps you should have used the -p or --strip option?
> The text leading up to this was:
> --------------------------
> |                       warnings = rs.getWarnings();
> --------------------------
> File to patch:
> Skip this patch? [y]
> Skipping patch.
> 3 out of 3 hunks ignored
> patching file
> `java/testing/org/apache/derbyTesting/functionTests/master/updatableResultSet.out'
> $
> 
> I remember getting something like this before, but can't remember
> exactly what I did to fix it.
> Any ideas?
> 
> Thanks
> 
> Kathey
> 
> 


Hi Kathey,

I did a sync of my client and regenerated a new patch. Here is the
patch, I hope it will go more smoothly than the last one. Please let
me know if it will help for me to provide the actual files rather than
the svn diff patch.

svn stat
M      java\drda\org\apache\derby\impl\drda\DRDAConnThread.java
M      java\testing\org\apache\derbyTesting\functionTests\tests\lang\updatableResultSet.java
A      java\testing\org\apache\derbyTesting\functionTests\master\DerbyNet\updatableResultSet.out
A      java\testing\org\apache\derbyTesting\functionTests\master\DerbyNetClient\updatableResultSet.out
M      java\testing\org\apache\derbyTesting\functionTests\master\updatableResultSet.out
M      java\testing\org\apache\derbyTesting\functionTests\master\jdk14\updatableResultSet.out

thanks,
Mamta

Mime
View raw message