On 7/21/06, Sunitha Kambhampati (JIRA) <[email protected]> wrote:
So, I am attaching a patch 10.1_derby1373.diff.txt for 10.1 codeline. Please note, it is the same changes as derby1373.diff.txt. svn stat: M java\engine\org\apache\derby\impl\services\jce\JCECipherFactory.java M java\testing\org\apache\derbyTesting\functionTests\tests\store\copyfiles.ant A + java\testing\org\apache\derbyTesting\functionTests\tests\store\encryptionKey_jar.sql A + java\testing\org\apache\derbyTesting\functionTests\tests\store\encryptionKey_jar_app.properties A + java\testing\org\apache\derbyTesting\functionTests\master\encryptionKey_jar.out M java\testing\org\apache\derbyTesting\functionTests\suites\encryptionAll.runall
I just took a look at this patch when I saw "A + " mentioned in the svn status. When merging and creating a new patch for a branch, I have seen that "A + " in svn status indicates only property change for new files. The contents of the new files are not added to the patch file. This had happened to me once but I have not looked at what the correct svn behaviour should be. To include the new files, I had done an "svn revert" and "svn add" for the "A + " files. In the attached patch, I see that the contents of new files "encryptionKey_jar.sql" and "encryptionKey_jar_app.properties" is missing in the patch. Please take a look. Thanks, Deepa
