Hello.
I have started committing DERBY-326.
I found conflicts in some files in testing directory and
resolved them.
Next three files were conflicted.
java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/copyfiles.ant
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/blobclob4BLOB.out
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/blobclob4BLOB.out
I will commit the patch after execution of derbyall suite, which is
running now.
Best regards.
--
/*
Tomohito Nakayama
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
Naka
http://www5.ocn.ne.jp/~tomohito/TopPage.html
*/
