| ... | ... | @@ -32,3 +32,18 @@ Any code changes should pass the following stages to be merged into the main bra |
|
|
|
5. Manual testing and code review
|
|
|
|
|
|
|
|
After all tests and code reviews are passed, the branch will be merged into the stable one (11.0).
|
|
|
|
|
|
|
|
### Forward ports
|
|
|
|
|
|
|
|
This section describes how to forward-port chages from one serie to another (for example from 12.0 to 13.0)
|
|
|
|
|
|
|
|
1. Switch to 13.0 version and pull latest changes
|
|
|
|
2. Create new branch: 13.0-forwardport
|
|
|
|
3. Merge latet changes from 12.0 version: ``git merge --no-ff --edit --no-commit origin/12.0``
|
|
|
|
4. Update versions of changed modules - ensure all modules have version 13.0.*
|
|
|
|
5. If there are migration in changes, adapt them to 13.0 version (usualy it is enought to change folder name to start from 13.0
|
|
|
|
6. Resolve conflicts.
|
|
|
|
7. Run tests for 13.0 version and ensure that all tests pases
|
|
|
|
8. If tests failed and fixin requires big changes, then commit and do fixes in separate commit(s)
|
|
|
|
9. If everything is Ok - commit
|
|
|
|
10. push changes |
|
|
\ No newline at end of file |
