[GRASS5] WARNING: CVS broken

[Bernhard Reiter]

On Mon, Aug 20, 2001 at 02:09:14PM +0200, Markus Neteler wrote:
> as we still not know which commits are missing on the current
> release_branch, the 5.0.0 release has to be delayed...

Okay: 
Here more analysis.

As you can see with viewcvs there are a lot of tags in the
grass tree: http://freegis.org/cgi-bin/viewcvs.cgi/grass/
(Selection box at the bottom.)

These tags include branch and non-branch tags.

The trouble was about the "releasebranch_11_april_2001_5_0_0" tag.
It was created as a branch and a branch tag.
For unknown reasons somebody also introduced a non-branch tag
with excatly the same name. Glynn noticed it first.

Glynn openend a new branch with a branch-tag of:
releasebranch_14_august_2001_5_0_0 

I have removed the non-branch tag "releasebranch_11_april_2001_5_0_0",
but left the branch tag with the same name in place.


Possible problems:

Changes done in the releasebranch_14_august_2001_5_0_0 branch
might need to be merged back to the releasebranch_11_april_2001_5_0_0 branch.

Files are been removed from the releasebranch_11_april_2001_5_0_0 branch 
by mistake in the process. Fix compare filenames to last release 
from this branch for completeness.


We should have another prerelease then.
It seems that there should be more disciplin in committing bug-fixes
to the branch.

	Bernhard



> On Mon, Aug 20, 2001 at 11:37:43AM +0200, Bernhard Reiter wrote:
> [...]
> > cvs -z4 diff -r tag  -r tag
> [...]
>  
> > > On Thu, Aug 16, 2001 at 12:33:56PM -0400, Eric Mitchell wrote:
> > > > 
> > > > Hi Markus,
> > > > 
> > > > > Is there any way to cvs diff the wrong release branch and the active
> > > > > one to find the mis-checked modules?
> > > > 
> > > > Try this:
> > > > 
> > > > # get the wrong release branch
> > > > cvs co -rwrong_release_branch
> > > > 
> > > > # merge changes between wrong and active
> > > > cvs update -j wrong_release_branch -j active_branch
> > > > 
> > > > # compare results
> > > > cvs diff
> > > > 
> 
> 
> at time I am somewhat lost as I am no CVS expert for the current
> problem. I neighter know the "wrong_release_branch" nor when it
> was applied and even don't know how to investigate.
> cvs history and
> cvs annotate
> 
> are not helpful for the analysis. If someone instructs me I am willing
> to check, however, I need assistance.
> 
> Bernhard has 
> "Removed irritating non-branch tag "releasebranch_11_april_2001_5_0_0".
> "
> 
> but I don't know how to check against this wrong tag. An error to start
> with is the html/r.in.gdal.html page which doesn't contain hints on NULL
> support which should be there.
> 
> Looking forward the release of 5.0.0 after fixing the CVS problems,

-- 
Professional Service around Free Software                (intevation.net)  
The FreeGIS Project                                         (freegis.org)
Association for a Free Informational Infrastructure            (ffii.org)
FSF Europe                                            	  (fsfeurope.org)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 248 bytes
Desc: not available
Url : http://lists.osgeo.org/pipermail/grass-dev/attachments/20010820/d2b0db0f/attachment.bin