Now that we have shipped v1, we are revising the definition of our branches to
follow common practice with Mercurial projects.
The main change is that the definition of the "default" branch is now "the
branch that contains the sources for the latest stable release" (1.0 for now,
1.1 for Mix11). Previously we would merge into default at the end of each
iteration. Now it will only be for each CodePlex release.
We are creating a new branch ("integration") which contains the integration
from "dev" of the last iteration work. In other words, "integration" is what
"default" used to be.
The meaning of "dev" is the same: "real-time" day-to-day work.
The meaning of "1.x" is the same: as we get close to a release we start working
day-to-day in "1.x" until we have stable bits. When ready, we merge to
"default" and put a tag in "default". The reason we have "1.x" is to free up
"dev" for eventual v.next work as we get close to a release.
In summary:
* "default" = branch containing the sources of the last release (1.0,
1.1, 2.0, etc.) <= new definition
* "integration" = branch containing the sources of the last iteration <=
new branch
* "dev" = branch containing the sources of the day-to-day work <= same
as before
* "1.x" = working branch when we get close to a release <= same as before
Cheers,
The Orchard Team
---
You are currently subscribed to orchard-discuss as: [email protected].
To unsubscribe send a blank email to [email protected].
