[Octopus-devel] tags in CVS: branches and releases mixed

[Axel Thimm]

Hi,

it looks like octopus-<version> was intended to be tags for releases,
not branches, or if they were intended to be branches indeed, then CVS
is missing release tags. E.g. currently it is not easy to make a diff
from the 2.0 release to the upcoming 2.0.1 release or similar. A
heuristic analysis shows that there are four "branches" (not counting
HEAD):

- carlo
- octopus-1_4
- octopus-1_4_alpha
- octopus-2_0

and 7 "releases":

- debian_version_1_0_1-1
- octopus-1_0
- octopus-1_01
- octopus-1_1
- octopus-1_2
- octopus-1_3
- octopus_2_0rc1

We need some sort of tagging convention to separate releases from
branches. I suggest something like

branch-2-0
 release-2-0
 release-2-0-1
 release-2-0-2
branch-2-1
 release-2-1rc1
 release-2-1rc2
 release-2-1
 release-2-1-1
branch-3-0

e.g. tags are prefixed in such a way that no one will misinterpret
them during checkouts or commits.

What do you think?

I've prepared a CVS checkout (with manual tuning of -r and -D) that is
"release-2-0" equivalent. Should I commit it to some "release" tag
convention?
-- 
Axel.Thimm at physik.fu-berlin.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: not available
Url : http://www.tddft.org/pipermail/octopus-devel/attachments/20060321/3d9e5dfd/attachment.bin