On Mar 4, 2011, at 9:08 AM, Rottinghuis, Joep wrote:
As far as I know, the pushes are done. The branching picture looks
roughly like:
--------------------------------+---------------+--------->
branch-0.20-security
\ \
\
branch-0.20-security-203
branch-0.20-security-202
The general model is that the 0.20-security branch is the main branch
and the 202, 203, ... are release branches that only get bug fixes on
them. The model would be every couple of months we'll make a new
release branch. So in a couple of months, we'll make a 204 branch from
0.20-security.
The mega-patch that Arun pushed was off of the 0.20-security-202
branch. Note that the branch-0.20-security-patches was a temporary
branch for me to push the individual commits to. It has been renamed
to replace the mega-patch version that Arun pushed. I'll roll a 203
release candidate tomorrow.
To clarify my understanding:
1) Is the tip of the branch-0.20-security supposed to be equal the
tip of branch-0.20-security-203? In other words, both branches
should differ only in history how they got there, but their content
at the end should be identical? They are close, but not the quite
the same. About 44 files are different between the two.
As I wrote above, Arun's mega-patch was a release off of the 202
branch. 203 and the main branch would be further along. Arun missed a
few files off of 202, but other than that the source code is the same.
Does that make sense?
-- Owen
