>>>> "vin" == Vin Shelton <acs(a)xemacs.org>
vin> As long as I have a tag to use, I don't care when I get moved
vin> off the main. Unless there's some subtlety I'm missing.....
Not that I know of. But getting the tag in place correctly will
require that you finish up whatever you're doing at the moment, then
cvs tag release-21-1, then update -r release-21-1, then start applying
stuff again. AFAICT, _you_ can do this anytime you want and just
announce that people have to use the tag from now on.
But if somebody else does it, I could easily see somebody else going
"oh, yeah, I was gonna move the HEAD today," cvs tag, cvs do lots of
stuff to move HEAD, right in the middle of you doing a bunch of
pre-release commits. Eek.
The other thing is that the last time there was serious discussion of
moving HEAD, somebody who claimed to have done it said we could expect
to have to take CVS down for a day or so. I really think the
Honorable Stable Release Manager might have a thing or two to say
about _that_. :-)
Also, Tor doesn't say, but I wonder what happens to CVS history data
when you do this.
>>>> "Tor" == Tor Arntsen
Tor> On May 16, 3:08, SL Baur wrote:
> O.K. Let's reverse the tags. Has anyone in the gallery
> done that before?
Tor> I have, on a couple of occations. It's a bit hairy. I'll
Tor> try to describe a couple of possible ways of doing it.
Tor> 1. First close off the repository for access. It's a good
Tor> idea to have all the developers with write access committing
Tor> their changes first. Be prepared to keep the repository
Tor> off-line for a day, at least!
Tor> 2. Back up the whole repository. You may have to repeat the
Tor> whole process..
Tor> Now we come to the different possibilities. Unfortunately it
Tor> isn't just to rename the existing branches to something else,
Tor> although it looks like it should be possible -- there's a
Tor> function in CVS to associate one name with another and you
Tor> get the impression that you can just give a branch a new name
Tor> and then delete the old name. Unfortunately this doesn't
Tor> work correctly in most versions of CVS (including the newest
Tor> ones), and it can mess up things badly. So something else
Tor> must be done.
Tor> The simplest way is to just tag the trunk as well as the
Tor> branches with something like
Tor> TERMINATED_FROZEN_OLD_OBSOLETE_release-whatever, and leave
Tor> the old branch tags in place. Then you would have to invent
Tor> a new naming scheme for the versions and create new branches.
Tor> The good thing about this method is that you don't really
Tor> modify the repository as such, and the probability that the
Tor> changeover will go smoothly for the developers is high.
Tor> 3. Tag as explained above. Remember to tag the main trunk
Tor> 4. Export the branch you want to be on the main trunk. Let's
Tor> say it's release-22-0, and that you tagged it as
Tor> 'OBSOLETE_22_0'. cd <some temporary place> cvs -d
Tor> <repository> export -rOBSOLETE_22_0 XEmacs/xemacs
Tor> 5. Check out the main trunk of XEmacs/xemacs somewhere else
Tor> (or update -A)
Tor> 6. Copy the exported tree over the checked-out main trunk.
Tor> You can't (easily) use "merge" for this, so the export/copy
Tor> method is used in order to move the branch unmodified over to
Tor> the main trunk.
Tor> 7. Commit the main trunk.
Tor> Now you want to move the previous content of the main trunk
Tor> over to a branch:
Tor> 8. Export the main trunk as described in step 4, obviously
Tor> you need a tag there which you can refer to (step 3).
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Institute of Policy and Planning Sciences Tel/fax: +81 (298) 53-5091
_________________ _________________ _________________ _________________
What are those straight lines for? "XEmacs rules."