>> declared 29/mar/2006. Also for release 1.0.
>
> Yes, and the TRUNK is the 0.95 Release? Am I right?
> After this date there were made some changes at the TRUNK, not many,
> but still.
> These changes were not made at the BRANCHES/Release-0.95, so they are
> not in sync.
> The BRANCHES/0.95 Release is not maintained, while the TRUNK-0.95 is,
> so there are two 0.95 releases.
No, the TRUNK is gradually moving forward particularly the ADL parser
and AOM classes. The Release-0.95 branch should only receive bug fixes,
while the TRUNK will eventually land on Release 1.0 and beyond. Some bug
fixes on the TRUNK should also be done on the Release-0.95, I agree.
OK, I misunderstood, maintaining the 0.95 version should be done in the
BRANCHES while the TRUNK only is to move forward (to 1.0).
But what is the development goal of the TRUNK then at this moment.
Because there is BRANCHE-work at the 1.0 version, will that be moved to the
TRUNK at a certain moment?, and at a certain moment be copied back?
Or will the TRUNK be moved back to the BRANCHE, ro wil,l they both undergo a
painful process of merge.
Are there two different working-trails toward 1.0 (The TRUNK and BRANCHE 1.0)
Isn't it too early to have a BRANCHE 1.0 release?
It is confusing
II have my doubts for several reasons
- the arrows in the documentation (CM_plan.pdf) point in the wrong direction,
the text in Figure5 page 19 explain that the fixes are made in the BRANCHE
and after that applied to the TRUNK. This is the situation at this moment.
- at the same time the same documents explains at page 17 that the TRUNK is
the mainline current development and the BRANCHES is for branche development
or test work.
I would understand the terminology "branche development" as:
The BRANCHE is to freeze a certain TRUNK-situation, and after that, for
offering a place for maintaining a certain (major) release, it is not a place
for growing towards a new release
When you apply these rules to 0.95, it works like it should, more or less
(0.95 should be patched, you are right) but applied to 1.0, I am really
confused, what is the main 1.0 version workline, when do we have a 1.0
release which is ready for production, how can we recognise this version in
SVN, because at this moment, we have two version which are both in
pre-beta-condition. I think the BRANCHE-1.0 should have another name
regards
Bert