From: Jeff D. <da...@da...> - 2001-02-08 18:54:54
|
There is a new tagged branch in the CVS named 'release-1_2-branch'. It's purpose it's to keep track of bug-fixes/changes in the 1.2.x branch of phpwiki. I've propagated all the bug-fixes currently in the main CVS branch into the new branch. From now on, if you make a bug-fix in the main branch which is appropriate to the 1.2.x branch as well, please commit your changes both places. Here's a mini-howto on dealing with tagged branches: To check-out the latest versions of the files within a tagged branch do something like: cvs -d...@cv...:/cvsroot/phpwiki \ co -r release-1_2-branch -d stable phpwiki This will checkout the stable branch into the directory named 'stable'. If you now 'cd' into 'stable', and run a 'cvs status', you will see that the tag 'release-1_2-branch' is set as a "sticky tag" for each of the files in the repository. Now you can edit the files normally, and when you're happy with them, commit them normally (using 'cvs commit [...]'.) (The "sticky tag" stuff causes the commit's to be checked in to the tagged branch, rather than the MAIN branch.) I find the following to be useful CVS references: http://cvsbook.red-bean.com/cvsbook.html -- a good tutorial http://www.loria.fr/~molli/cvs/doc/cvs_toc.html --- the CVS info file, online Jeff |