I've been analysing the differences between the head and the release
branch. Here's a summary.
1. There are 82 directories in the head which aren't in the release branch,
including:
locale
src.nonGPL
src.todo
unused
2. There are 34 files in the head which aren't in the release branch.
14 of these are Gmakefiles which simply build subdirectories; the
other 20 are:
documents/grass_live_links.txt
html/html/d.vect.area.html
html/html/d.vect.line.html
html/html/v.in.dgn.html
html/html/v.label.html
html/html/v.out.dgn.html
html/html/v.split.html
src.contrib/CERL/sgi.txt
src.contrib/GMSL/g3d/AUTHORS
src.contrib/GMSL/g3d/src3d/BUGS
src.contrib/PURDUE/README
src.contrib/SCS/README
src.contrib/SCS/vector/grass5.txt
src.garden/README.grass5
src.garden/grass.postgresql/g.select.pg/test.c.example
src/include/geom.h
src/libes/vect32_64/README_vect32_64
src/raster/r.in.dted/dt_util.c
src/tcltkgrass/module/d.vect.area
src/tcltkgrass/module/d.vect.line
3. There are 3 files in the release branch which aren't in the head:
src.garden/grass.postgresql/g.select.pg/test.c
src/mapdev/v.alabel/TODO
src/mapdev/v.llabel/TODO
4. There are 38 files which differ between the head and the release
branch, not including differences which can be automatically ignored
as due to a CVS keyword ($Id$, $Date$ etc). Of these, 19 differ only
due to the use of the $Log$ keyword; these are:
src.contrib/GMSL/NVIZ2.2/TOGL/togl.c
src.contrib/GMSL/NVIZ2.2/src/togl.c
src.contrib/GMSL/NVIZ2.2/src/togl.h
src.garden/grass.postgresql/v.in.shape.pg/dbfopen.c
src.garden/grass.postgresql/v.in.shape.pg/shpopen.c
src/display/d.extend/cmd/main.c
src/general/g.region/cmd/main.c
src/libes/gis/sites.c
src/libes/vect32_64/shapelib-1.2.8/dbfcreate.c
src/libes/vect32_64/shapelib-1.2.8/shptest.c
src/libes/vect32_64/shapelib-1.2.8/shputils.c
src/raster/r.agnps50/HISTORY.txt
src/raster/r.agnps50/howto-install.txt
src/raster/r.in.gdal/gbgetsymbol.c
src/raster/r.in.gdal/gdalbridge.c
src/raster/r.in.gdal/gdalbridge.h
src/raster/r.in.gdal/make_loc.c
src/raster/r.topidx/main.c
src/raster/r.topmodel/main.c
The other 19, which genuinely differ, are:
src.garden/grass.postgresql/g.select.pg/Gmakefile
src.garden/grass.postgresql/g.select.pg/getdbname.c
src.garden/grass.postgresql/g.select.pg/listdb.c
src.garden/grass.postgresql/g.select.pg/main.c
src.garden/grass.postgresql/g.table.pg/Gmakefile
src.garden/grass.postgresql/g.table.pg/infxTable.c
src.garden/grass.postgresql/g.table.pg/main.c
src/CMD/head/head.in
src/CMD/lists/GRASS
src/display/d.dm/d.dm
src/display/d.vect/cmd/local_proto.h
src/display/d.vect/cmd/main.c
src/display/d.vect/cmd/plotCat.c
src/include/gis.h
src/include/gisdefs.h
src/libes/gis/plot.c
src/mapdev/v.alabel/main.c
src/mapdev/v.llabel/main.c
src/tcltkgrass/main/menu.tcl
I will detail the specifics in a separate message.
As for the use of $Log$, can we stop using it? All of the other
keywords can be ignored automatically by using diff's -I switch.
However, unlike the other keywords, the text which is inserted by
$Log$ isn't restricted to the line which contains the keyword, so
files which differ do to $Log$ must by eliminated manually by visual
inspection.
--
Glynn Clements <glynn.clements@virgin.net>