On Sat, 12 Mar 2005 06:41:58 -0800, Kathey Marsden
<kmarsdenderby@sbcglobal.net> wrote:
> Mamta Satoor wrote:
>
> >Hi,
> >
> >Here is a small patch with few tests for the concurrency bug. I have
> >run all the existing tests and there are no failures.
> >
> >
> >
>
> 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
>
>
Like all the other patches in the past, I simply gave svn diff
>filename.txt and then attached the filename.txt to the patch mail to
the derby list.
Mamta
|