Re: Update on the branch surgery

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

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.
-- 
		<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.