[GRASS5] GRASS 5.0.0 branch question
John Huddleston
jhudd at lamar.colostate.edu
Fri Mar 30 08:45:17 EST 2001
Good morning Markus,
Whenever you update files on your local system with the -r
option, it is like a checkout from the repository with that
TAG. As such, "cvs update -r releasebranch_5_0_0"
brings out that code and places a sticky tag in the CVS/Entries
files. Look at one as an example. You'll see a
Treleasebranch_5_0_0 at the end of each line.
cvs --help update gives the options and shows that
the -r and -D checks out code as sticky
Use the cvs update -A to release the Tag
Use the command
cvs commit -m "comment" -rreleasebranch_5_0_0 REQUIREMENTS
to commit the REQUIREMENTS file to the branch
That help?
John
----- Original Message -----
From: "Markus Neteler" <neteler at geog.uni-hannover.de>
To: "grass5 developers list" <grass5 at geog.uni-hannover.de>
Sent: Wednesday, March 28, 2001 1:49 AM
Subject: [GRASS5] GRASS 5.0.0 branch question
> Hi CVS gurus,
>
> it seems I need an advice:
>
> I have created the release branch recently (at least I think so):
>
> 1. tagging the sources
> 2. checking out this tagged version into new directory
> 3. applying
> cvs tag -b "releasebranch_5_0_0"
> here
>
> Like that the branch should have been created (as far as I understand the
> CVS book).
>
> To upgrade my second copy to this branch, I used
> cvs update -r releasebranch_5_0_0
>
> So far, so good (?).
>
> Now I want to apply a change from exp/main tree to this release tree, but
> I get
>
> cvs ci -m"updated" REQUIREMENTS # I simply copied this file from exp tree
>
> cvs server: sticky tag 'releasebranch_5_0_0' for file 'REQUIREMENTS' is not a
> branch
> cvs [server aborted]: correct above errors first!
>
> What's that?
>
> Thanks for any help,
>
> Markus
>
> PS: I try to interpret now:
> http://www.loria.fr/~molli/cvs/doc/cvs_5.html#SEC49
>
> ----------------------------------------
> If you want to unsubscribe from GRASS Development Team mailing list write to:
> minordomo at geog.uni-hannover.de with
> subject 'unsubscribe grass5'
----------------------------------------
If you want to unsubscribe from GRASS Development Team mailing list write to:
minordomo at geog.uni-hannover.de with
subject 'unsubscribe grass5'
More information about the grass-dev
mailing list