Richard Coleman <coleman(a)math.gatech.edu> writes in xemacs-beta(a)xemacs.org:
Peter> If I want to track the 21.0 sources, must I `cvs update -R
Peter> release-21-0' in said directory? ...
>
> If you wish to track both versions use two XEmacs source trees. Check
> out one with the default branch, eg. something like
Ugh. Two source trees? I thought one of the purposes of CVS was to
have a unified version of the source. Why is this?
? It's one CVS tree. You need two checked-out source trees if you
wish to track both branches. I don't see any other way to do it
easily.
The way things are being kept in synch (for the most part), I don't
see a particular need for anyone to track both branches unless they're
really gung-ho about it.
Also, what about adding tags like xemacs-current and xemacs-stable
that would track these two branches without dealing with version
numbers.
Good idea.
Also, my understanding is that 21.0 is the main part of the tree
and 21.2 is a branch.
Correct. Assuming XEmacs doesn't die out in the interim, I think this
should be reversed in the future -- ie. the bleeding edge version is
always the default branch and the stable version is the forked branch.
Is there any chance of eventually flipping this, so that the
developmental sources are always the main line of the tree?
Yes. The plan has been to do this when 21.0.final is made.