Re: Update on the branch surgery

[Eric S. R. <es...@th...>]

Daniel J Sebald <dan...@ie...>:
> >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.)

I did.  It's how I tracked down some of the true branch joins before you guys
did the CVS analysis.

> 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.
-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>

My work is funded by the Internet Civil Engineering Institute: https://icei.org
Please visit their site and donate: the civilization you save might be your own.