Mailing-List: contact derby-dev-help@db.apache.org; run by ezmlm
Precedence: bulk
Reply-To: <derby-dev@db.apache.org>
Received-SPF: pass (asf.osuosl.org: local policy)
Date: Tue, 06 Jun 2006 12:20:56 +0530
From: Mayuresh Nirhali <Mayuresh.Nirhali@Sun.COM>
Subject: Merging 1072 patch in 10.1 branch
Sender: Mayuresh.Nirhali@Sun.COM
To: derby-dev@db.apache.org
Reply-to: Mayuresh.Nirhali@Sun.COM
Message-id: <448525D0.8030801@Sun.COM>
MIME-version: 1.0
Content-type: multipart/mixed; boundary="Boundary_(ID_z0/OFyZXq9VaPhF1sE1f5A)"
User-Agent: Mozilla/5.0 (X11; U; SunOS i86pc; en-US; rv:1.7) Gecko/20060221

This is a multi-part message in MIME format.

--Boundary_(ID_z0/OFyZXq9VaPhF1sE1f5A)
Content-type: text/plain; format=flowed; charset=us-ascii
Content-transfer-encoding: 7BIT

Hello,

The fix for Derby-1072 recently got committed to the trunk 
(409578,409713). Now, I wish to have this committed in the 10.1.3 branch.

As per the instructions, I was trying to merge these patches with 10.1 
local client and wanted to test the fix so that it can be committed quickly.

The command, svn merge -r 409577:409578 
https://svn.apache.org/repos/asf/db/derby/code/trunk, brought up some 
conflicts in some files. I have attached the output of above command.

The problem here is that my changes are on top of some more changes 
which are not in 10.1 branch as yet. So, I think it will be ideal to 
have those changes committed first and then this patch can be tested and 
committed.

In this scenario, how can I test my patch in the 10.1 branch locally ??

P.S. >> I have not specified the FIX version to be 10.1.3 as yet.

Thanks
Mayuresh,

--Boundary_(ID_z0/OFyZXq9VaPhF1sE1f5A)
Content-type: text/plain; name=brnch-mrg-409578.txt
Content-transfer-encoding: 7BIT
Content-disposition: inline; filename=brnch-mrg-409578.txt

U    java/engine/org/apache/derby/loc/messages_en.properties
Skipped missing target: 'java/testing/org/apache/derbyTesting/functionTests/tests/lang/grantRevoke.java'
U    java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ieptests.out
C    java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/supersimple.out
U    java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/synonym.out
U    java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk15/prepStmt.out
U    java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk15/csPrepStmt.out
U    java/testing/org/apache/derbyTesting/functionTests/master/schema5.out
U    java/testing/org/apache/derbyTesting/functionTests/master/declareGlobalTempTableJavaJDBC30.out
U    java/testing/org/apache/derbyTesting/functionTests/master/prepStmt.out
U    java/testing/org/apache/derbyTesting/functionTests/master/dropTable.out
U    java/testing/org/apache/derbyTesting/functionTests/master/dml149.out
U    java/testing/org/apache/derbyTesting/functionTests/master/views.out
U    java/testing/org/apache/derbyTesting/functionTests/master/holdCursorJavaReflection.out
U    java/testing/org/apache/derbyTesting/functionTests/master/importExportThruIJ.out
C    java/testing/org/apache/derbyTesting/functionTests/master/miscerrors.out
Skipped missing target: 'java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL.out'
U    java/testing/org/apache/derbyTesting/functionTests/master/LOB.out
U    java/testing/org/apache/derbyTesting/functionTests/master/testij.out
U    java/testing/org/apache/derbyTesting/functionTests/master/depend.out
U    java/testing/org/apache/derbyTesting/functionTests/master/j9_13/ejbql.out
U    java/testing/org/apache/derbyTesting/functionTests/master/renameTable.out
U    java/testing/org/apache/derbyTesting/functionTests/master/ieptests.out
U    java/testing/org/apache/derbyTesting/functionTests/master/iepnegativetests.out
C    java/testing/org/apache/derbyTesting/functionTests/master/supersimple.out
U    java/testing/org/apache/derbyTesting/functionTests/master/LOBDB2compatibility.out
U    java/testing/org/apache/derbyTesting/functionTests/master/csPrepStmt.out
U    java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ieptests.out
C    java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/supersimple.out
U    java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/synonym.out
U    java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out
U    java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk15/prepStmt.out
U    java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk15/csPrepStmt.out
Skipped missing target: 'java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/grantRevokeDDL.out'
Skipped missing target: 'java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/grantRevoke.out'
U    java/testing/org/apache/derbyTesting/functionTests/master/declareGlobalTempTableJava.out
U    java/testing/org/apache/derbyTesting/functionTests/master/ejbql.out
U    java/testing/org/apache/derbyTesting/functionTests/master/checkConstraint.out
U    java/testing/org/apache/derbyTesting/functionTests/master/altertable.out
U    java/testing/org/apache/derbyTesting/functionTests/master/schemas.out
U    java/testing/org/apache/derbyTesting/functionTests/master/statementJdbc20.out
U    java/testing/org/apache/derbyTesting/functionTests/master/dml147.out
U    java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out
U    java/testing/org/apache/derbyTesting/functionTests/master/synonym.out

--Boundary_(ID_z0/OFyZXq9VaPhF1sE1f5A)--