page2
Bug Fix flow
The nature of our project means that we develop bug fixes in several different branches and doesn't always reflect the more classic schema of many other upstream projects.
Our goal is to make sure that bug fixes are propagated across all branches.
A practical example:
1) a bug is found in the master branch:
a) does the bug affect STABLE3?
b) does the bug affect STABLE2?
c) does the bug affect RHEL5Y?
d) does the bug affect RHEL4Y?
If the answer is yes to either A or B, cherry pick the fix in the proper branch.
If the answer is yes to either C or D, follow the commit procedure for RHEL and then cherry pick the fix into the latest RHEL5Y or RHEL4Y branch and then:
e) does the bug needs to be in z-stream?
If the answer is yes, then follow the z-stream procedure for that specific RHEL branch.
The bottom line is, that no matter where a bug is found, all other branches should be checked immediately for the same bug. Postponing the propagation of a bug fix becomes problematic in the long run and can cause a lot of overhead work in bugzilla, git trees, QE and etc.