Re: Update on the branch surgery

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

On 10/26/2017 08:35 PM, Eric S. Raymond wrote:
> Daniel J Sebald <dan...@ie...>:
>> OK, now the two things I feel are unresolved.
>>
>> 1) We need to figure out where CVS GNUPLOT_RELEASE_3_7_0 corresponds to the
>> git master branch changeset, and create a tag 3.7.0 for that.  That will
>> also be the grafting point for the 3.7.x series branch.
> 
> Agreed, if we're foing to save that branch at all/
> 
>> 2) The master branch point in the attached screenshot of qgit originates
>> from before beta340, beta343, etc.  I wonder if master branch should instead
>> start at the point where all the other branches in that screenshot are
>> emanating.  The point prior to import of beta340, etc. would be "Initial
>> revision".
> 
> The picture looks significantly different now. You should get the
> latest version of the conversion script via
> 
>         wget http://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.
> 
> This means that complex join you're talking about is gone.  All
> branches are now off trunk; the remaining question is where 3.7.x
> should be rooted, and how many of the commits early on the branch can be
> dropped when we reroot it.

OK, thanks, they all should be off of the master branch.  I don't think 
any of the 3.7.x branch need to be dropped, and we might want to revisit 
the shims.

I've made quite a bit of progress without having to resort to a script 
file.  qgit has this nice feature in which one can select a file and it 
will list all the changesets that have happened for that particular file 
rather than everything changing in the repository.  With that I can 
quickly look at the evolution of the version and date listed in the file 
version.c.  (I don't know why I didn't think to look at version.c sooner.)

At the first changeset, "Windows linestyle fix.", of that 3.7.x branch 
the contents of version.c are:

char version[] = "3.7";
char patchlevel[] = "0";
char date[] = "Thu Jan 14 19:34:53 BST 1999";
char gnuplot_copyright[] = "Copyright(C) 1986 - 1993, 1998, 1999";

Looking through the evolution of version.c on the trunk, the above 
information corresponds to the range

New date string.          1/14/99 1:35 PM
char version[] = "3.7";
char patchlevel[] = "0";
char date[] = "Thu Jan 14 19:34:53 BST 1999";

New patchlevel.           1/26/99 7:49 AM
char version[] = "3.7";
char patchlevel[] = "1";
char date[] = "Thu Jan 14 19:34:53 BST 1999";

The first version above is the first appearance of that particular 
date[].  The next version varies in the patch level (i.e., different 
from the "Windows linestyle fix." version.  That's about a dozen 
checkins or so, which I can do manually.  So here it goes...

[1/14/99 8:13 AM] Child: Windows linestyle fix.
git -C branch_reference checkout 3f354a490c5839042db43ca0bdc30a87ec54882c
---
commit 4246b753d7c88b71131db21013e1d083df03a41b
Author: Laxx Hexxxxx <xxxxxx@xxxxxx>
Date:   Tue Jan 26 13:42:30 1999 +0000
     Add R.Fearicks PGP key.
git -C root_reference checkout 4246b753d7c88b71131db21013e1d083df03a41b
diff -ur --exclude=".git" root_reference/ branch_reference/ | grep "^-"| 
grep -v "^---" | wc -l
diff -ur --exclude=".git" root_reference/ branch_reference/ | grep "^+"| 
grep -v "^+++" | wc -l
756 + 1001
---
commit 3b532520520eb44172b2035ed612031489ca17f1
Author: Laxx Hexxxxx <xxxxxx@xxxxxx>
Date:   Tue Jan 26 13:42:18 1999 +0000
     Add contents of new lisp subdir.
git -C root_reference checkout 3b532520520eb44172b2035ed612031489ca17f1
diff -ur --exclude=".git" root_reference/ branch_reference/ | grep "^-"| 
grep -v "^---" | wc -l
diff -ur --exclude=".git" root_reference/ branch_reference/ | grep "^+"| 
grep -v "^+++" | wc -l
739 + 1001
---
commit 69e824692b443cd978b7c030979183345b30b874
Author: Laxx Hexxxxx <xxxxxx@xxxxxx>
Date:   Tue Jan 26 13:39:18 1999 +0000
     Take out part about dartmouth ftpmail.
git -C root_reference checkout 69e824692b443cd978b7c030979183345b30b874
diff -ur --exclude=".git" root_reference/ branch_reference/ | grep "^-"| 
grep -v "^---" | wc -l
diff -ur --exclude=".git" root_reference/ branch_reference/ | grep "^+"| 
grep -v "^+++" | wc -l
722 + 997
---
commit 3f931c64ee321f083e199ba02950cdc9019f99cd
Author: Laxx Hexxxxx <xxxxxx@xxxxxx>
Date:   Thu Jan 14 19:35:52 1999 +0000
     New file.
git -C root_reference checkout 3f931c64ee321f083e199ba02950cdc9019f99cd
diff -ur --exclude=".git" root_reference/ branch_reference/ | grep "^-"| 
grep -v "^---" | wc -l
diff -ur --exclude=".git" root_reference/ branch_reference/ | grep "^+"| 
grep -v "^+++" | wc -l
722 + 977
---
commit cc12bfe09ac8fc58aaf14a839d6f0c88b881d80d
Author: Laxx Hexxxxx <xxxxxx@xxxxxx>
Date:   Thu Jan 14 19:35:25 1999 +0000
     New date string.
git -C root_reference checkout cc12bfe09ac8fc58aaf14a839d6f0c88b881d80d
diff -ur --exclude=".git" root_reference/ branch_reference/ | grep "^-"| 
grep -v "^---" | wc -l
diff -ur --exclude=".git" root_reference/ branch_reference/ | grep "^+"| 
grep -v "^+++" | wc -l
722 + 977
---
commit 6c5bae9e97d91bb3f1feefaa420cca5e081a8d72
Author: Laxx Hexxxxx <xxxxxx@xxxxxx>
Date:   Thu Jan 14 19:34:40 1999 +0000
     Add copyright note.
git -C root_reference checkout 6c5bae9e97d91bb3f1feefaa420cca5e081a8d72
diff -ur --exclude=".git" root_reference/ branch_reference/ | grep "^-"| 
grep -v "^---" | wc -l
diff -ur --exclude=".git" root_reference/ branch_reference/ | grep "^+"| 
grep -v "^+++" | wc -l
723 + 978
---
commit 7e6c32e2525e903d41c9f2dfdb538ec874221f89
Author: Laxx Hexxxxx <xxxxxx@xxxxxx>
Date:   Thu Jan 14 19:34:16 1999 +0000
     Add PGPKEYS.
git -C root_reference checkout 7e6c32e2525e903d41c9f2dfdb538ec874221f89
diff -ur --exclude=".git" root_reference/ branch_reference/ | grep "^-"| 
grep -v "^---" | wc -l
diff -ur --exclude=".git" root_reference/ branch_reference/ | grep "^+"| 
grep -v "^+++" | wc -l
723 + 982
---
commit ec0e9cd9964cff216a3cc4d9e82ece2a34f83173
Author: Laxx Hexxxxx <xxxxxx@xxxxxx>
Date:   Thu Jan 14 19:33:43 1999 +0000
     Updated.
git -C root_reference checkout ec0e9cd9964cff216a3cc4d9e82ece2a34f83173
diff -ur --exclude=".git" root_reference/ branch_reference/ | grep "^-"| 
grep -v "^---" | wc -l
diff -ur --exclude=".git" root_reference/ branch_reference/ | grep "^+"| 
grep -v "^+++" | wc -l
749 + 1008


So, it boils down to these two:

commit 3f931c64ee321f083e199ba02950cdc9019f99cd
Date:   Thu Jan 14 19:35:52 1999 +0000
     New file.
722 + 977
---
commit cc12bfe09ac8fc58aaf14a839d6f0c88b881d80d
Date:   Thu Jan 14 19:35:25 1999 +0000
722 + 977

OK, I'm looking at the diffs for these two (very similar of course). 
There is too much code changes (as opposed to documentation and version 
change) for these to be the branch point for "Windows linestyle fix.". 
But, I think something is odd about the diffs I'm seeing right now, so 
I'll skip this idea for now and come back to it.

So, let's just answer the GNUPLOT_RELEASE_3_7_0 question.  Consider the 
following from CVS log:

PGPKEYS:
	GNUPLOT_RELEASE_3_7_0: 1.1

OK, so 3f931c64ee321f083e199ba02950cdc9019f99cd must be in 3.7.0.

OREADME:
	GNUPLOT_RELEASE_3_7_0: 1.10
----------------------------
revision 1.11
date: 1999/01/26 13:39:18;  author: lhecking;  state: Exp;  lines: +0 -20
Take out part about dartmouth ftpmail.
----------------------------
revision 1.10
date: 1999/01/13 21:48:26;  author: lhecking;  state: Exp;  lines: +1 -1
branches:  1.10.2;
Add Win9[58] to platform list.
----------------------------

Well, that means revision 1.11 and hence
commit 69e824692b443cd978b7c030979183345b30b874
Date:   Tue Jan 26 13:39:18 1999 +0000
     Take out part about dartmouth ftpmail.

(the checkin after 3f931c64) is *not* in 3.7.0.

Hence, my best guess for version 3.7.0 is

commit 3f931c64ee321f083e199ba02950cdc9019f99cd
Date:   Thu Jan 14 19:35:52 1999 +0000
     New file.


OK, so as with 3.7.1, et al., I do a diff with CVS GNUPLOT_RELEASE_3_7_0 
and that particular changeset, and once again I see all these RCSid 
differences.  There are a lot of copyright differences, and there are 
some demo and doc directory file differences, one or two similar to that 
HBB.

Something's odd.  Here's an example of the RCSid difference:

diff -ur '--exclude=.git' root_reference/alloc.c gnuplot/alloc.c

--- root_reference/alloc.c	2017-10-26 23:54:21.297038908 -0500
+++ gnuplot/alloc.c	1998-04-15 14:21:56.000000000 -0500
@@ -1,11 +1,11 @@
  #ifndef lint
-static char *RCSid = "$Id: alloc.c,v 1.11 1997/04/10 02:32:39 drd Exp $";
+static char *RCSid = "$Id: alloc.c,v 1.1.1.2 1998/04/15 19:21:56 
lhecking Exp $";
  #endif

I've gone back to the CVS repository, no git conversion, and there 
simply is no version of alloc.c that has an RCSid of

static char *RCSid = "$Id: alloc.c,v 1.11 1997/04/10 02:32:39 drd Exp

There is no 1.11 for ./alloc.c, and I've looked at everyone of the 
versions of alloc.c in the CVS repository and there's no drd anywhere 
for that file.

sebald@ ~/gnuplot/gnuplot/gnuplot $ cvs diff -u -r1.1 -r1.1.1.1 alloc.c
Index: alloc.c
===================================================================
RCS file: /cvsroot/gnuplot/gnuplot/Attic/alloc.c,v
retrieving revision 1.1
retrieving revision 1.1.1.1
diff -u -r1.1 -r1.1.1.1
--- alloc.c	15 Apr 1998 19:16:27 -0000	1.1
+++ alloc.c	15 Apr 1998 19:16:27 -0000	1.1.1.1
@@ -1,5 +1,5 @@
  #ifndef lint
-static char *RCSid = "$Id: alloc.c,v 1.1 1998/04/15 19:16:27 lhecking 
Exp $";
+static char *RCSid = "$Id: alloc.c,v 1.1.1.1 1998/04/15 19:16:27 
lhecking Exp $";
  #endif


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.

Dan




Re: Update on the branch surgery

A portable, multi-platform, command-line driven graphing utility

Re: Update on the branch surgery