= McCode Development Strategy = The McCode source tree is common to two projects, McStas and McXtrace. This means that many people will suffer if something breaks in the common source code. To remedy this situation, it has been decided to use SVN branches extensively, meaning that almost any development project should take place in a dedicated branch. These rules of thumb have been formulated: * Use a branch when adding functionality or any other development * For bugfixes, '''small''' (1-10 line) edits of '''one file''' are ok to do on the trunk * Use a branch if you are to edit more than one file * Use a branch if your edits require more than one SVN commit (and big edits '''should''') * Please use your modified branch for testing / daily use before merging edits back to the trunk When creating your branch, please the naming scheme yourname_whatyouaredoing, i.e. willend_pythongui A set of example commands for SVN branches / merging will be written here as soon as possible