Hi Bryan,
If you are referring to DERBY-821.diff. I tried applying it to a
workspace on my machine. It seems to work fine with the following
output. I am also attaching the output of patch -v with this email. My
workspace is at revision 374831. I work on a solaris environment.
[] $ ../../../patch/installation/bin/patch -p 0 < DERBY-821.diff
patching file java/drda/org/apache/derby/impl/drda/DRDAResultSet.java
Hunk #2 succeeded at 490 (offset -2 lines).
patching file java/drda/org/apache/derby/impl/drda/XADatabase.java
patching file java/drda/org/apache/derby/impl/drda/DRDAStatement.java
Hunk #1 succeeded at 1623 with fuzz 1 (offset -24 lines).
patching file java/drda/org/apache/derby/impl/drda/Database.java
patching file java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
Hunk #1 succeeded at 7360 (offset 2 lines).
patching file
java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJava.java
patching file
java/testing/org/apache/derbyTesting/functionTests/tests/lang/forupdate.sql
patching file
java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorIJ.sql
patching file
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/setTransactionIsolation.java
patching file
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/forupdate.out
patching file
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/holdCursorIJ.out
patching file
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/updatableResultSet.out
patching file
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/forupdate.out
patching file
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/updatableResultSet.out
patching file
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorIJ.out
patching file
java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out
patching file
java/testing/org/apache/derbyTesting/functionTests/master/forupdate.out
patching file java/client/org/apache/derby/client/net/NetResultSet.java
patching file
java/client/org/apache/derby/client/net/NetDatabaseMetaData.java
patching file java/client/org/apache/derby/client/net/NetSqldta.java
patching file java/client/org/apache/derby/client/net/NetConnection.java
patching file java/client/org/apache/derby/client/net/NetCursor.java
patching file
java/client/org/apache/derby/client/net/NetStatementRequest.java
patching file java/client/org/apache/derby/client/net/NetStatementReply.java
patching file java/client/org/apache/derby/client/am/Cursor.java
patching file java/client/org/apache/derby/client/am/ResultSet.java
patching file java/client/org/apache/derby/client/am/SqlCode.java
patch -v
patch 2.5.4
Copyright 1984-1988 Larry Wall
Copyright 1989-1999 Free Software Foundation, Inc.
This program comes with NO WARRANTY, to the extent permitted by law.
You may redistribute copies of this program
under the terms of the GNU General Public License.
For more information about these matters, see the file named COPYING.
written by Larry Wall and Paul Eggert
thanx
Narayanan
Bryan Pendleton wrote On 02/04/06 11:21,:
Hi Knut Anders,
I am hoping to read through your patch in more detail this weekend,
and I will let you know of any comments that I have.
I am having a bit of trouble applying your patch. Maybe my connection
to JIRA is damaged, but when I download the patch as an attachment,
the lines are corrupted near line 219 of the .diff file.
There appear to be some control characters in the diff file as it is
returned from JIRA. In VIM, I see ^@ symbols in the file.
Can you verify that the patch file in JIRA is well-formed (the problem
may well be on my end)?
thanks,
bryan
