Re: Update on the branch surgery

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

On 10/27/2017 03:56 AM, Daniel J Sebald wrote:
> OK, so the current git repository on sourceforge has a problem at the 
> very onset that is propagated throughout the whole master branch.  It's 
> that issue with the branch point of master we discussed previously.  I'm 
> going to need a recent git repository, but I think I've found the 3.7.0 
> version location and I'm pretty sure we'll be in good shape if we get 
> that initial series of imports and branches correct.

All right, following up on where I left off, I believe I've found what 
the issue is but don't know how to fix it.  I've created the latest 
gnuplot-git translation from the address here:

On 10/26/2017 08:35 PM, Eric S. Raymond wrote:
 > The picture looks significantly different now. You should get the
 > latest version of the conversion script via
 >
 >         wgethttp://www.catb.org/~esr/gnuplot-conversion.tar.gz
 >
 > Because I know you're trying to save the 3.7.x branch, I have 
rectified the
 > 4-0-stable branch - I rerooted it to where it should have branched off
 > master in 2004 and inserted a shim commit to make demo/gnuplot.rot right
 > at the branch tip.

I now see the branches all coming from the trunk.  However, the probably 
I described last night is still present.  It explains all the 
discrepancy I've been seeing, and it also explains the shim Eric needed 
to apply to resolve this difference:

# HBB: revised open-ended animation routine. Used to just turn
# round and round by somewhat large steps. Now, it tumbles
# back and forth smoothly.
# If 'limit_iterations' is set to a nonzero value, it'll stop after that
# many iterations (iteration_count=0 has to be set before this
# script is called)
zrot=(zrot+10)%360
xrot=(xrot+17)%180

I was seeing similar types of discrepancies in the demo files in the CVS 
GNUPLOT_RELEASE_3_7_0 versus git "Windows linestyle fix" comparison.

Similar to what I described last night, the latest git translation still 
has the not-quite-correct master branch from the very beginning.  The 
translation conflates the DRD pre-CVS repository versions of files. 
These files with the wrong RCSid and the demo-file discrepancies and the 
backward-progressing copyright dates reside in the master branch *until* 
some changeset resolves them.  In the case of 3.7.x branch, there are a 
hundred "corrupted" files still, but shortly after 3.7.0 was completed 
there was a mass restructuring which moved files like alloc.c to a new 
subdirectory.  That action resulted in the correct files going forward, 
such that 4.x and 5.x series all match well...except for the 4.0 shim 
that Eric noted, probably a vestige still of what I described.

To illustrate how at the very beginning of the repository the master 
branch goes askew, here is a comparison of CVS

=============================================================================
RCS file: /cvsroot/gnuplot/gnuplot/Attic/alloc.c,v
Working file: alloc.c
[snip]
----------------------------
revision 1.2
date: 1999/03/23 12:21:51;  author: lhecking;  state: Exp;  lines: +26 -11
Fix segfault.
=============================================================================

and the git version of ./alloc.c from changeset

36c68278c6b7ee95d3b3eb17f7db2f6243a5ca88
  alloc.c | 35 +++++++++++++++++++++++++----------
  1 file changed, 25 insertions(+), 10 deletions(-)


sebald@ ~/gnuplot/git_translation/reposurgeon/gnuplot-conversion $ diff 
-u ~/gnuplot/gnuplot/gnuplot/alloc.c gnuplot-git/alloc.c
--- /home/sebald/gnuplot/gnuplot/gnuplot/alloc.c	2017-10-27 
11:13:19.527538578 -0500
+++ gnuplot-git/alloc.c	2017-10-27 11:15:23.962994028 -0500
@@ -1,5 +1,5 @@
  #ifndef lint
-static char *RCSid = "$Id: alloc.c,v 1.2 1999/03/23 12:21:51 lhecking 
Exp $";
+static char *RCSid = "$Id: alloc.c,v 1.12 1998/03/22 22:31:16 drd Exp $";
  #endif

  /* GNUPLOT - alloc.c */

OK, the above difference, for a hundred-plus files is what I'm seeing 
when attempting to graft the "Windows linestyle fix." onto master branch.

So, we need to go back to the start of the repository and make sure 
those first few commits, the "Import of beta 340", etc. are done 
properly such that something like the following set of files all match 
in terms of stamped revisions and branches:

=============================================================================

RCS file: /cvsroot/gnuplot/gnuplot/Attic/alloc.c,v
Working file: alloc.c
head: 1.3
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 6;	selected revisions: 6
description:
----------------------------
revision 1.3
date: 1999/03/26 21:45:50;  author: lhecking;  state: dead;  lines: +1 -1
Moved to src/.
----------------------------
revision 1.2
date: 1999/03/23 12:21:51;  author: lhecking;  state: Exp;  lines: +26 -11
Fix segfault.
----------------------------
revision 1.1
date: 1998/04/15 19:16:27;  author: lhecking;  state: Exp;
branches:  1.1.1;
Initial revision
----------------------------
revision 1.1.1.2
date: 1998/04/15 19:21:56;  author: lhecking;  state: Exp;  lines: +24 -9
branches:  1.1.1.2.2;
Import of beta 343.
----------------------------
revision 1.1.1.1
date: 1998/04/15 19:16:27;  author: lhecking;  state: Exp;  lines: +0 -0
Initial import of beta340.
----------------------------
revision 1.1.1.2.2.1
date: 2001/06/25 16:06:34;  author: broeker;  state: Exp;  lines: +6 -5
histeps vs. log y axis bugfix, and gp_alloc return type fixed
=============================================================================

How should we proceed Eric?

Dan