Project evolutions during maintenance time

Hi all,      We have a project with some bugs, and we must continue the fonctional developpement.    - One team will work to correct the bugs  - Another team will work in evolutions    Bugs that are corrected by the first team must by applyed for the second team. But the evolutions done by the second team must not be present in the correction work (because my customer is still testing the first part of the project and we don't want evolutions create bugs in it).    I though to make 2 projects and the first team will apply their work on the two project, manually, but it don't look like to be a very good solution.    I don't know branches, but before study these part of versionning systems, I would like if it can help to organize my teams ?      Thank you very much    Aurélien

Last updated 14 years ago

Yes, you should have two branches (at least). One for the fixes and one for the new work. You would then need to merge the changes from the fix branch to the new branch.    Please look at the svn book: http://svnbook.red-bean.com/nightly/en/index.html ...specifically the section on branching and merging, for that is exactly what you want to do.    Perhaps the best alternative is to create branches according to version numbers, so your customer can be testing v1 while you're working on v1.1, and when your customer is ready for v1.1, you can do all your enhancements and features in a new v1.2 branch while fixes take place in the v1.1 branch.

Merci beaucoup, je vais étuder tout ça :)    Aurélien