Commit 8c231179 authored by Petr's avatar Petr

Merge branch 'repo' into 'master'

Repo

See merge request !6
parents d4fa1c1d 64bda2dd
......@@ -11,53 +11,38 @@
5. **Repositories**
6. [Testing](./TESTS.md)
## easyproject/devel
All developing repositiories have following structure.
```
+-------+
| devel |
+---+---+
|
+---v---------------+
| release-candidate |
+-------------------+
|
+---v--------+
| bug-fixing |
+---+--------+
|
+---v----+
| master |
+--------+
| devel |
+---+----+
|__________________
|
+--------+ +--------v----------+
| early |<---| early-on-testing |
+---+----+ +-------------------+
|__________________
|
+--------+ +--------v----------+
| stable |<---| stable-on-testing |
+--------+ +-------------------+
```
- `devel`
- Main development branch for new features
- `early`
- Branch released for early access adopters
- `early-on-testing `
- Bug fixing and testing for upcoming early release
- `stable`
- Last released branch
- `stable-on-testing`
- Branch for fixing bugs in upcoming version
- MR review is thorough
- Mistakes could be propagated to clients so maximal attention is required
## Gantt, Resource management, WBS
```
+-------+ +-------------------+ +--------+
| devel |--->| release_candidate |--->| master |
+---+---+ +-------------------+ +--------+
```
- `devel`
- Main development branch for new features
- `release_candidate`
- upcoming release branch
- No new features only bug fixes
- Feature is there 2 month
- `release-candidate`
- For testing new features before final release
- After 2 months, devel is merged into this branch
- There is 1 month of testing
- Only fixes found during testing are accepted here
- `bug-fixing`
- Fixing for released version
- For bugs which have to be tested or are not critical
- `master`
- stable branch
- Critical fixes that are released with review form QA team
- Stable released version
- Only critical fixes are allowed
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment