Hi,
We discussed the 0.7.1 Chandler Desktop release during the dev meeting
(see http://chandlerproject.org/Journal/AppsMeeting20070806). One issue
we discussed was: where in svn should we host those changed?
Heikki proposed to continue to do the changes on trunk once we branch
0.7 Preview. Others voted "hey" initially but, after some thoughts, it
was unclear and no consensus was really achieved though the "make it
from trunk" remained the plan of record. We decided then to bring the
discussion to this list so that everyone can think about it.
So here are the 3 alternatives with Pros/Cons for each. Let's start
first with the constraints and assumptions:
- A1: We'll branch 0.7 Preview as soon as we declare ZBR. That's
standard process to stabilize the code base of a release and, of course,
we want to be able to reopen the trunk at some point for more in depth
changes.
- A2: SVN branches are cheap.
- C1: We need to be able to post quick fix updates of 0.7 Preview on
very short notice. That means that a really nasty bug reported by users
can be fixed under 24 hours if possible.
Now the solutions:
- S1: commit on the 0.7 Preview branch:
- Pros: simple topology, allow big change in trunk immediately, we
already know 0.7.1 will need all bug fixes plus those already targeted
- Cons: goes against C1 (we may destabilize the branch preventing a
quick fix to be released)
- S2: commit on the trunk:
- Pros: simple topology, keep everyone focused on the immediate
short term objective, no change required on TBox, build, etc... to get
0.7.1 out
- Cons: prevent big rework to be done (people will need to create
private branches)
- S3: commit on a special 0.7.1 branch:
- Pros: maximum flexibility
- Cons: need to get TBox and build to work on that branch too, more
merges of fixes between branches (more possibility of "forgetting"
one...), one more build for QA to test (though we won't be doing 0.7
Preview builds very often and only on demand).
I personally prefers S3 as it doesn't block anything or anyone. In a
way, we create a big 0.7 branch (of which 0.7.0 aka Preview and 0.7.1
are sub branches) and the trunk starts 0.8 now. S2 is OK as long as it's
short (which is the plan) and, considering we do not have an 0.8 plan
yet, makes sense. S1 seems risky and/or will morph into S3 at the first
serious "must fix now" bug reported by users...
Makes me think that the real question is: should we consider the trunk
"0.8" (the beginning of the next major release) and branch all "0.7" or
should we wait to make that major branching?
What do you guys think?
Cheers,
- Philippe
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
Open Source Applications Foundation "chandler-dev" mailing list
http://lists.osafoundation.org/mailman/listinfo/chandler-dev
