|
From: Nick C. <nic...@ve...> - 2002-01-30 15:34:41
|
Hi, I'm going to branch the CVS tree tomorrow (thurs.) morning. The branch will be repast-1_4. The idea here is that Mike North's changes to the scheduler are now ready to go back into CVS for our consumption (thanks Mike!). However, his changes are big enough that they won't be introduced until 2.0, and we still have some work planned for 1.4.1 and maybe beyond depending on when 2.0 is ready. The fork will allow us to work on both simultaneously. At the moment, I think, Mike and I will be the only ones working with 2.0. Tom and anybody else will be working with 1.4. Of course, anyone can get 2.0 for their delectation but I know Tom's current work is scheduled for release with 1.4.1 as is some code I'm working on. So, once I've created the branch, y'all who are working on 1.4 will need to update to this branch. To check out / update from a branch, you do: cvs checkout -r repast-1-4 ... cvs update -r repast-1-4 ... More info on CVS branches can be found at: http://www.loria.fr/~molli/cvs/doc/cvs_5.html#SEC49 Once your working copy is tied to the branch, any commit / updates can be made as usual. Its probably a good idea to move your working copy to a different source directory. So, if you have something like ~/src/repast/..., you could move the repast dir to ~/src/repast-1-4/, and then do your cvs update -r repast-1-4 from there. As I said above, I'll be doing this tomorrow (thurs.) morning unless I hear anything from y'all. Once I've done it, I'll send out an email and y'all can do the update, and Mike can commit his new code to the main branch. Nick -- Nick Collier Social Science Research Computing University of Chicago http://repast.sourceforge.net |