Re: Update on the branch surgery

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

On 10/27/2017 03:28 PM, Eric S. Raymond wrote:
> Daniel J Sebald <dan...@ie...>:
[snip]
>> That drd RCSid (and a lot of the copyright notices...no wonder they are
>> going backward from 1999 to 1998) must be coming from prior to the start of
>> this CVS.  I'm going to guess that drd, et al. were using a different CVS
>> repository prior to the start for which there *was* a version 1.11 of this
>> file.  But then Lars started a new one.
>>
>> 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.
> 
> At leasr part of the problem is this sequence at the beginning:
> 
> c57b183 *** empty log message ***   <--- branch point
> e2e7fb8 Initial import of beta340.
> 73285bb Content from historic/gnuplot-3.5.tar.gz
> cdd7d69 Content from historic/gnuplot-3.2.tar.gz
> 6070b01 Content from historic/gnuplot-3.1.tar.gz
> 605e727 Content from historic/gnuplot-3.0.tar.gz
> 6bc888c Content from historic/gnuplot-2.0.tar.gz
> 55fe23a Content from historic/gnuplot-1.10A.tar.gz
> e56802d Content from historic/gnuplot-1.1.tar.gz
> 
> That top commit is actually an import of 3.6 beta - I'll edit the comment
> to reflect that at some point.  Also that beta 340 is a 3.4.0 beta which
> should swap places with the 3.5 commit.  3.7. branches off from c57b183.
> 
> The real problem, I think, is the early 3.7 commits:
> 
> e30004 Rewrite option handling and use execvp() instead of execl().
> ad4911d Windows linestyle fix.
> cccd8de Import of beta 347.
> 9a208db Import of beta 346.
> 0a418be Import of beta 345.
> 7c5413c Import of beta 344.
> 78d32b1 Import of beta 343.
> 00d2bf2 Initial import of beta340.
> c57b183 *** empty log message ***   <--- branch point
> 
> Internally all of those up to 347 actually predate the 3.6 beta. I think this
> is where your weird RCS IDs - and probably other divergences - are coming from.
> I'm thinking about making a conversio with those commits (especially the dubious
> re-import of 3.4.0) ripped out.

I'm pretty sure it is the very beginning of the git translation.  In a 
previous post I sent this difference:

=============================================================================
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(-)

     Fix segfault.

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 */

That changeset is on master branch and has nothing to do with the 3.7.x 
series at that point in time.  That suggests the master branch is not in 
sync with the CVS repository until just after the massive directory 
restructuring.

Dan