Hello all As you all know we have switched from the google code repositories to several bitbucket repositories. In the new situation we have 2 repositories per package, a stable and a development package. As we are moving on we notice that there are some practical issues that occur with the repositories. When there are people working on the stable line, doing some bugfixes, and there are people working on the dev line for entire new developments the two repositories of the same package become (very) different. It is important that the stable code is merged regularly into the development code to make sure that the dev line still receives all the latest updates / bugfixes from the stable and to avoid having serious issues when the development is finally ready and needs to be pushed into the stable line.
I propose that the developers from the dev repo's pull the code from the stable line on a regular base and merge them into there development code. When conflicts occur they should contact the developers who are working on the stable repo's to determine together what the best merge is. If this is done on a daily basis then the final merge from the development to the stable repo will be much easier because most of the conflicts will already be resolved during the development. In short: If you are doing bugfixes with no database changes: * you should fix them on the stable repository * you should follow the development on the dev repo to avoid double work (see feature list support.chamilo.org) If you are doing new developments: * you should add them to the development repository * you should MERGE with the stable repository on DAILY basis * any merge conflicts should be discussed with the active bug fixer on that package (irc / dev mailing list) Communication will be of an extreme importance because of the many repositories. Any questions? Send an email to the dev list or join us at irc.freenode.org #chamilo -- Met vriendelijke groeten Sven Vanpoucke Digitaal Leren Directie Onderwijs Hogeschool Gent http://digitaal-leren.hogent.be/ _______________________________________________ Dev mailing list [email protected] http://lists.chamilo.org/listinfo/dev
