Hi all
Yesterday I took some time to merge all the stable repo's to the dev
repo's because in one month we will need to merge the dev repo's into
the stable. I expected the merges to be very hard, but i noticed that
from the 150 repositories we have, only a few were having conflicts.
There are still a few bugs that have come with the merge. It seems like
mercurial his merge sometimes removes certain things from the code which
shouldn't be removed.
The biggest issues are currently in the weblcms and the repository. In
these packages we had the entire mdb2.class.php as a mercurial conflict.
I'll try to fix the obvious bugs asap. I would encourage all of you who
are working on the dev to do this merge very often so that the final
merge to the stable on the end of may won't cause these problems.
--
Met vriendelijke groeten
Sven Vanpoucke
Digitaal Leren
Directie Onderwijs
Hogeschool Gent
http://digitaal-leren.hogent.be/
_______________________________________________
Dev mailing list
Dev@lists.chamilo.org
http://lists.chamilo.org/listinfo/dev
