[kepler-dev] 2.0.0 beta1 branch instructions

[Chad Berkley]

Just thought I'd mention how to do merges.  Go to a checked out version 
of the trunk module.  Do the following:

svn merge 
https://code.kepler-project.org/code/kepler/trunk/modules/<module> 
https://code.kepler-project.org/code/kepler/branches/releases/release-bra
nches/<module>-2.0

This will merge changes into your working copy.  You then need to 
resolve any conflicts and then commit.

chad


Chad Berkley wrote:
> Hi,
> 
> The code has been branched for the 2.0 kepler release.  Here are the 
> instructions for getting and using the branch:
> 
> 1) check out the build-area from the branch:
> svn co 
> https://code.kepler-project.org/code/kepler/branches/releases/release-branches/build-area-2.0 
> build-area
> 
> cd build-area
> 
> 2) change-to the branched kepler suite:
> ant change-to 
> -Dbranch=https://code.kepler-project.org/code/kepler/branches/releases/release-branches/ 
> -Dsuite=kepler-2.0
> 
> 3) ant run
> 
> I've tested this on a clean checkout and it worked with ant.  I have not 
> tested it on any IDEs yet.  Please let me know if it doesn't work for you.
> 
> All Kepler 2.0 code must now be checked into this branch.  Any code that 
> should also be in the trunk must be merged accordingly.
> 
> Note that this is using rev 57289 of ptolemy which is the 8.0-beta2 
> branch.  Please do not run validate-ptolemy on the branch.  I will 
> update the revision as Christopher releases new versions of ptolemy.  At 
> RC1, I will freeze the version of ptII we are using.
> 
> thanks,
> chad
> _______________________________________________
> Kepler-dev mailing list
> Kepler-dev at kepler-project.org
> http://mercury.nceas.ucsb.edu/kepler/mailman/listinfo/kepler-dev