Re: Update on the branch surgery

[Petr M. <mi...@ph...>]

Those "beta 3xy" are patchlevels of gnuplot 3.6, not patchlevels of gnuplot 
3.4.

I've found some my old OS/2 patches, wherefrom I can see that:
- gnuplot 3.6 beta 336 was available in April 1997
- gnuplot 3.6 beta 340 was available in April 1998

Petr


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