MlView branch management policy
Dodji Seketeli <[email protected]> Sun, 3 Oct 2004 13:09:00 +0200
| Newsgroups | gmane.editors.mlview.devel |
|---|---|
| Message-ID | <[email protected]> |
Hi, Now that 0.7.0 has been pushed out, there are some branch management policies we have to follow. FROM GNU ARCH PERSPECTIVE ============================ First of all, I have created a new archive named [email protected] . It is located at http://www.gnome.org/~dodji/arch/2005/mlview/ . All the new features development will happen there for now. We previously worked in the tree version [email protected]/mlview--mainline--0.7 for MlView 0.7 . For now, this tree version will be frozen and only bugfixes for MlView 0.7.x will get into [email protected]/mlview--mainline--0.7. New features development for MlView 0.8.0 will be commited in the tree version [email protected]/mlview--main--0.8. Of courses, fixes that will hit mlview--mainline--0.7 will be merged (by the magic of arch) into mlview--main--0.8. In short, we have two trees: one for bugfixes (for the coming MlView 0.7.x), and one for new features (for the coming 0.8.0). So we need to be disciplined here. We should not fix bugs that are present in 0.7.0 in the mlview--main--0.8 tree. We should fix them in mlview--mainline--0.7 only. I will merge them quickly in mlview--main--0.8. That way, we can make a bugfix 0.7.1 bugfix release quickly, without stopping our work on the 0.8.0 that'll come later. What tla black magic do contributors need to do ================================================ 1/to hack on new features ========================= (register to [email protected]) $ tla register-archive http://www.gnome.org/~dodji/arch/2005/mlview (create a child branch of the mlview--main--0.8 branch. Please, choose a short and representative branch name.) $ tla tag -S [email protected]/mlview--main--0.8 <your-personal-archive-name>/mlview--<yourbranchname>--0.8 (Now, to test if the black magic has worked, check out the code from your brand new personal branch) $ tla get <your-personal-archive-name>/mlview--<yourbranchname>--0.8 ~/the-black-magic-code The code checked out from your band new personnal branch, should be in ~/the-black-magic-code. You can hack on it from now like what you were doing before. 2/to fix bugs in the mlview--mainline--0.7 tree version ======================================================= (if you were hacking on mlview--mainline--0.7 before, man, nothing changes for you) (if you never registered to [email protected]/mlview--mainline--0.7 then the instruction below is for you) (register yourself to the [email protected] archive) $ tla register-archive http://www.gnome.org/~dodji/arch/2004/xml-style (check out the mlview--mainline--0.7 tree version) $ tla get [email protected]/mlview--mainline--0.7 3/to hack on the website ======================== (register to [email protected] if you haven't done it yet) $ tla register-archive http://www.gnome.org/~dodji/arch/2005/mlview (create a child branch of the [email protected]/mlview--web--0.1 tree version) $ tla tag -S [email protected]/mlview--web--0.1 <your-private-archive-name>/mlview--<yourbranchname>--0.1 (checkout the code from your brand new private branch) $ tla get <your-private-archive-name>/mlview--yourbranchname>--0.1 ~/mlviewwebsite The checked out website source tree should be in ~/mlviewwebsite. FROM THE CVS PERSPECTIVE ========================= I have created CVS mlview-0-7 branch from the current CVS HEAD. Minor bugfix releases (0.7.x) will be made on this branch. CVS HEAD will now be dedicated to development releated to 0.8.0. If there is something you didn't understand, please, do not hesitate to ask on the mailing list, or come to irc://irc.gnome.org#mlview . There should be people there (including myself) to help you. Cheers, Dodji.