[GRASS5] WARNING: CVS broken

[Markus Neteler]

On Thu, Aug 16, 2001 at 06:36:17PM +0200, Bernhard Reiter wrote:
> Files, which have been checkout and commited 
> in the time period where there were the irritating non-branch tags
> where in the repository might have landed on the wrong branch.
> 
> On Thu, Aug 16, 2001 at 06:17:41PM +0200, Markus Neteler wrote:
> > while investigatin if all recent fixes have reached the CVS,
> > I found this inconsistency (am I'm wrong?):
> > 
> >   cat html/html/r.in.gdal.html |tail -3 
> > <p><i>Last changed: $Date: 2001/07/09 12:43:32 $</i>
> > 
> > Running
> > "make changelog" (rather equal to cvs2cl.pl) I find:
> > 2001-08-08 23:09  frankw
> >  
> >         * html/html/r.in.gdal.html: added notes on null support
> > 
> > Obviously this is not in CVS (and more). Where is it gone?
> 
> It is in the cvs in the main branch:
> Check:
> 	http://freegis.org/cgi-bin/viewcvs.cgi/grass/html/html/r.in.gdal.html
> and
> 
> 	http://freegis.org/cgi-bin/viewcvs.cgi/grass/html/html/r.in.gdal.html.diff?r1=text&tr1=1.8.2.2&r2=text&tr2=1.9&diff_format=h
> 
> That is the good part of cvs: It rarely looses data at all
> if it was checked in once.

:-)

However, in this case Frank Warmerdam first checked into exp tree, then
(after I realized that) into the release branch.
 
> > Dear developers, please check if your changes are present
> > in current CVS.

Is there any way to cvs diff the wrong release branch and the active
one to find the mis-checked modules?

Thanks for your patience,

 Markus