Re: Roundup of GNUPLOT conversion issues

[Daniel J S. <dan...@ie...>]

On 10/29/2017 03:48 PM, Hans-Bernhard Bröker wrote:
> Am 29.10.2017 um 20:31 schrieb Daniel J Sebald:
> 
>> I don't think the exact tarballs are there.  I sort of have a 
>> recollection of whenever a release was to be made, the tarball 
>> required some extra effort on someone's part.
> 
> Not back then they didn't.  The tarballs can be generated directly from 
> a fresh working copy, just by running
> 
>      ./configure && make dist
> 
> But all that effectively does is make a version-named copy of the source 
> tree without "CVS" directories and .cvsignore files, and tarball that.
> 
> Any actual differences between that and the official release tarball are 
> down to either
> 
> a) auto-tools of different versions being re-run at 'make' time, or
> b) last-minute fixes applied directly to the tarball, manually
> 
> Only when we switched to automake, dropped all generated files from the 
> repository, and started using the 'prepare' script instead, did tarball 
> contents start to be really different from fresh working copies of their 
> corresponding CVS tags.

Thanks for the -I '\$[A-Z]*[a-z]*', it's a major help.  I've done a 
comparison of cvs2git and CVS at GNUPLOT_RELEASE_3_7_3 and get agreement 
aside from the cruft of empty CVS directories an so on.  There are these 
few variations on the RCS-style lines:

diff -ur '--exclude=.git' -I '\$[A-Z]*[a-z]*' 
/home/sebald/gnuplot/gnuplot/gnuplot/docs/old/ChangeLog.old 
/home/sebald/gnuplot/git_translation/cvs2git_test/clonedgit/myproject/gnuplot/docs/old/ChangeLog.old
--- /home/sebald/gnuplot/gnuplot/gnuplot/docs/old/ChangeLog.old 
2017-10-29 15:27:21.998077850 -0500
+++ 
/home/sebald/gnuplot/git_translation/cvs2git_test/clonedgit/myproject/gnuplot/docs/old/ChangeLog.old 
2017-10-28 22:02:43.908845219 -0500
@@ -8,10 +8,7 @@
   * working. This means that the revision numbers in the individual files
   * do not agree with the one in the log. I hope to fix this some time 
soon.
   *
- * $Log: ChangeLog.old,v $
- * Revision 1.1  1998/11/16 13:07:33  lhecking
- * Moved from version.c.
- *
+ * $Log$
   *
   * I have moved these entries from version.c. All future code changes
   * should be logged in ChangeLog. Lars Hecking
Only in /home/sebald/gnuplot/gnuplot/gnuplot/docs/old: CVS
diff -ur '--exclude=.git' -I '\$[A-Z]*[a-z]*' 
/home/sebald/gnuplot/gnuplot/gnuplot/docs/old/makefile.r 
/home/sebald/gnuplot/git_translation/cvs2git_test/clonedgit/myproject/gnuplot/docs/old/makefile.r
--- /home/sebald/gnuplot/gnuplot/gnuplot/docs/old/makefile.r	2002-01-26 
12:55:02.000000000 -0600
+++ 
/home/sebald/gnuplot/git_translation/cvs2git_test/clonedgit/myproject/gnuplot/docs/old/makefile.r 
2017-10-29 15:49:42.034090965 -0500
@@ -1,10 +1,7 @@

-# $Id: makefile.r,v 1.1.2.1 2002/01/26 18:55:02 lhecking Exp $
-#
-# $Log: makefile.r,v $
-# Revision 1.1.2.1  2002/01/26 18:55:02  lhecking
-# Support for pdf and W3C Scalable Vector Graphics output.
+# $Id$
  #
+# $Log$
  # Revision 1.1  1998/12/09 17:24:30  lhecking
  # Moved from ../..
  #
diff -ur '--exclude=.git' -I '\$[A-Z]*[a-z]*' 
/home/sebald/gnuplot/gnuplot/gnuplot/docs/old/README.3p5 
/home/sebald/gnuplot/git_translation/cvs2git_test/clonedgit/myproject/gnuplot/docs/old/README.3p5
--- /home/sebald/gnuplot/gnuplot/gnuplot/docs/old/README.3p5	2017-10-29 
15:27:22.006077850 -0500
+++ 
/home/sebald/gnuplot/git_translation/cvs2git_test/clonedgit/myproject/gnuplot/docs/old/README.3p5 
2017-10-28 22:02:43.912845219 -0500
@@ -1,12 +1,9 @@
  This is a bugfix to version 3.4.


-# $Id: README.3p5,v 1.1 1998/11/16 13:01:23 lhecking Exp $
-#
-# $Log: README.3p5,v $
-# Revision 1.1  1998/11/16 13:01:23  lhecking
-# Moved from top level dir.
+# $Id$
  #
+# $Log$
  # Revision 1.1  1993/09/27 17:07:30  alex
  # gnuplot 3.5 release
  #


The cvs-fast-export result, with reposurgeon rebase of the branch to the 
same point of the cvs2git branch doesn't match so well.  Here are the 
files that differ:

amiga.c
Copyright
ctrl87.c
ctrl87.h
demo/gnuplot.rot
docs/gpcard.tex
docs/old/ChangeLog.old  [This is RCSid diff, does not count]
docs/old/makefile.r     [Ditto]
docs/old/README.3p5     [Ditto]
fnproto.h
intergra.x11
os9.c
win/wgnuplib.c
win/wprinter.c
win/wresourc.h

In qgit applied to cvs2git translation, I can trace the changes in these 
files back to the changeset "Import of beta 343." (amiga.c, Copyright, 
et al.) and "Import of beta 344." (demo/gnuplot.rot).  I believe what we 
are missing is as simple as merging those utility branches back into 
master branch at the start of the repository.

Dan