Re: Update on the branch surgery

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

On 10/27/2017 11:50 AM, Daniel J Sebald wrote:
> On 10/27/2017 03:56 AM, Daniel J Sebald wrote:
[snip]
> 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
> ============================================================================= 

Eric,

In the current version of git repository there are the following first 
two changesets:

commit 0a606cafef166159398ad975ad56e4492f80cb82
Author: Lars Hecking <lhe...@nm...>
Date:   Wed Apr 15 20:16:46 1998 +0100

     Initial import of beta340.

commit 073a0e00ba43dd4d0dd78db04b51226c73ca9656
Author: Lars Hecking <lhe...@nm...>
Date:   Wed Apr 15 20:16:47 1998 +0100

     *** empty log message ***

at which point there is a bifurcation into "master" and "3.7.3" branches 
(we know the latter branch has to be grafted somewhere).  I take it that 
the branch at the very start is a result of this sort of thing at the start:

----------------------------
revision 1.1.1.1
date: 1998/04/15 19:16:27;  author: lhecking;  state: Exp;  lines: +0 -0
Initial import of beta340.
----------------------------

Anyway, if I understand correctly, you began with the code base of 
pre-CVS which was this

[1.1][1.10A][2.0][3.0][3.1][3.2][3.5] Initial import of beta340.

i.e., that very first commit in gnuplot-git.  Actually, there are no 
files in that commit.  It is the next commit *** empty log message *** 
where the files come in.  (Shouldn't those files come in with the first 
commit already?)

There is something missing between the import of these pre-CVS files and 
the master branch; it's the "Initial revision":

----------------------------
revision 1.1
date: 1998/04/15 19:16:27;  author: lhecking;  state: Exp;
branches:  1.1.1;
Initial revision
----------------------------

What I mean by that is the CVS repository really starts with something 
different than the imported files as they existed just prior to import. 
By creating the new CVS repository, Lars probably did some picking and 
choosing (intentional or not...noting HBB's explanation of how CVS file 
versioning works and how Lars could have something slightly different on 
his system).  What's more, the very action of Lars creating that Initial 
revision is going to replace all the RCSid strings from DRD's code base 
with the new RCSid strings from Lars' code base.

I think what we need to do as the very second step/changeset is extract 
the CVS repository as it existed just after its creation:

cvs update -D"1998/04/15 19:16:53"

(I picked a time 1 minute after was looked like the time associated with 
the latest "Initial revision" entry in the CVS log...is that correct HBB?)

and then branch the master off of that introduced changeset.  That way 
we are assured that master branch starts with something exactly the same 
as what the Lars CVS repository starts with.

Dan