[Mitgcm-support] RE: Release1 branch

[mitgcm-support at dev.mitgcm.org]

I don't think we want tutorial_examples to be part of "checkpoint"
downloads - do we?
We want to have a separate set of experiment configurations that are tied
to the Release and the documentation. For Release2 the set of tutorial
examples may be quite different. If people want supported and documented
software they need to work from Releases - checkpoints are geared only
toward experienced, sophisticated users, hence no tutorial examples!
Isn't that what we wanted?

Also isn't it slightly odd to have a branch called "release1". That means if
I type "cvs co -r release1" I get the HEAD of the branch. Is that what
we want? The original plan was  to create tags on release1-branch called
release1-betaXX and release1-finalXX whenever we needed it, with the
possibility
to create a moving tag called "release1" if we could figure out how that
could
be done in a non-ambiguous way.

Anyhow - nice diagram, but why didn't you just create a tag
called relese1-beta2 on release1-branch!

Chris
-----Original Message-----
From: adcroft at nymph.whoi.edu [mailto:adcroft at nymph.whoi.edu]On Behalf Of
Alistair Adcroft
Sent: Wednesday, January 23, 2002 11:53 AM
To: support at mitgcm.org
Subject: Release1 branch


Gentlemen,
I've been deciphering the process that led to the branch "release1-branch":

it was made on Jan 14th, 2002
the branch point seems to correspond to -D "12:45 11 Jan 2002"
there's no tag for the branch-point
there's no tags on the branch itself
The picture looks somthing like this (Fig. 1):

As it stood, there is no easy way to determine differences between revisions
on the branch except using dates (ie. -D "15 Jan 2002") and you can't use
dates for merging revisions between two points.
What we wanted and had discussed before Christmas was this (Fig. 2):

Note that in Fig. 2 the tags checkpoint43, release1_beta1 are equivalent in
terms of revisions but could have had different directory structures.
As discussed before Christmas and again this week, we should try to adhere
to the following guidelines:
all changes/revisions are made to the MAIN trunk and never solely to the
branch
changes to the branch are made by making a "cvs merge" between checkpoints
not all revisions on the MAIN trunk need be merged into the branch (as
indicated on Fig. 2)
I've made the tags and branches as shown in Fig. 2 except for the following
differences:
release1_beta2 is not yet made since I wasn't sure whether all changes
between checkpoint43 and checkpoint44 are supposed to be in.
I haven't yet added the tutorials since I don't see why the don't exist in
the MAIN trunk too.
The old branch is still in place but we should remove it soon.
Alistair.