[GRASS-dev] GRASS 6.3.0RC1 released

[Glynn Clements]

Carlos Dávila wrote:

> >>>> I looked at your announcement for the 6.3 release. It is excellent. I
> >>>> noticed several new modules that have been missed in the menu and need to be
> >>>> added. Can I just add them to the current grass6 cvs source I've been
> >>>> working with for 6.3 or do I need to check out another source tree for a
> >>>> release branch to add them?
> >>>>         
> >>> Add them to the head first, then back-port to the release branch after
> >>> testing.
> >>>
> >>> The quickest way to get the release branch is to make a copy of the
> >>> head (cp -a) then run "cvs update -r releasebranch_6_3" in the copy.
> >>>
> >>> To sync changes from the trunk to a branch, use "cvs update" with two
> >>> -j switches, e.g.:
> >>>
> >>> 	cvs update -j releasebranch_6_3 -j HEAD
> >>>
> >>> This is roughly equivalent to:
> >>>
> >>> 	cvs diff -r releasebranch_6_3 -r HEAD | patch -p0
> >>>       
> >> I followed your instructions to send some changes to both head and 
> >> release branch. Files were updated in my local releasebranch copy, but 
> >> doesn't seem to have changed in repository (or I'm looking in the wrong 
> >> place).
> >>     
> >
> > Both of the above only update the local copy; you need to use
> > "cvs commit" to actually commit the changes.
> 
> Yes, but the problem is I did "cvs ci" from releasebranch copy and it 
> did nothing.

First, check that your local copy is of the release branch, not the
trunk (or a specific release), by looking at the CVS/Tag and
CVS/Entries files for the directory in question. The former should
contain Treleasebranch_6_3, while the latter should have that tag at
the end of each entries.

Also, using "cvs update -j ... -j ..." assumes that you have already
committed the changes to the trunk. To clarify:

1. Make changes to the local copy of the trunk.
2. Commit the changes.
3. Change directory to the local copy of the branch.
4. Use "cvs update -j ... -j ..." to synchronise the branch to the
trunk.
5. Commit the changes.

-- 
Glynn Clements <glynn at gclements.plus.com>