In message <201003222232.o2mmw3ak025...@d06av04.portsmouth.uk.ibm.com>, Mark Hindess writes: > > I've now made the corresponding changes and merges to perform the same > consolidation for the branches that form the java6 tree. Workspaces > using thie java6 federated build tree should be fixed using:
If you have a workspace that is older than r922675[0], then you will need to do: svn up -r922675 ant # read the failure message about moving working_classlib to classlib, etc. # and make the changes svn up ant populate-src Many thanks to Oliver for helping prove that my instructions were not foolproof. ;-) Regards, Mark. [0] Actually, r922670 is enough for trunk but this works for java6 too. > svn up > ant populate-src > > Workspaces with just classlib/branches/java6 can be fixed by using: > > svn switch \ > https://svn.apache.org/repos/asf/harmony/enhanced/branches/java6/classlib > > Similarly for workspaces containing just drlvm or just jdktools. > > Please do not make any commits to the old trees. > > I will leave the old locations around for two weeks before removing them > to allow people time to migrate. > > I will now fix the Hudson builds. > > Regards, > Mark. > > In message <201003222036.o2mkas5x022...@d06av01.portsmouth.uk.ibm.com>, > "Mark Hindess" writes: > > > > As discussed elsewhere, I have moved the classlib, drlvm, jdktools > > trees for trunk (java5) into the federated build tree. Workspaces > > with the federated build tree should be fixed using: > > > > svn up > > ant populate-src > > > > Workspaces with just classlib can be fixed up using: > > > > svn switch https://svn.apache.org/repos/asf/harmony/enhanced/trunk/classl > ib > > > > Similarly for workspaces for just drlvm or just jdktools. > > > > Please do not make any more commits to the old trees. Namely: > > > > harmony/enhanced/classlib/trunk > > harmony/enhanced/drlvm/trunk > > harmony/enhanced/jdktools/trunk > > harmony/enhanced/common_resources/trunk > > > > Commits should be made to the new locations. Namely: > > > > harmony/enhanced/trunk/classlib > > harmony/enhanced/trunk/drlvm > > harmony/enhanced/trunk/jdktools > > harmony/enhanced/trunk/common_resources > > > > I will leave the old locations around for two weeks before removing them > > allow people time to migrate. > > > > Please report any issue with migration on this thread. > > > > Apologies for the inconvenience but it should greatly simplify our > > svn/build structure. > > > > After running some more tests, and completing any outstanding merges > > from trunk, I shall be making the equivalent changes to the java6 > > federated build. > > > > Regards, > > Mark. > > >
