Re: Update on the branch surgery

[Ethan A M. <sf...@us...>]

On Wednesday, October 25, 2017 3:18:37 PM PDT Eric S. Raymond wrote:
> I have successfully transplanted 4.2, but 4.0 has a problem.  Rebasing
> it on /#include gp_time.h/ yields this diff at the tip:
> 
> --- a/demo/gnuplot.rot	1998-04-22 09:38:42.000000000 -0400
> +++ b/demo/gnuplot.rot	2017-10-25 17:39:55.083147765 -0400
> @@ -1,12 +1,5 @@
> -# HBB: revised open-ended animation routine. Used to just turn
> -# round and round by somewhat large steps. Now, it tumbles
> -# back and forth smoothly.
> -# If 'limit_iterations' is set to a nonzero value, it'll stop after that
> -# many iterations (iteration_count=0 has to be set before this -#
> script is called)
>  zrot=(zrot+10)%360
>  xrot=(xrot+17)%180
> -set view (50.+30.*sin(xrot/180.*pi)),60.+45.*sin(zrot/180.*pi)
> +set view xrot,zrot
>  replot
> -iteration_count=iteration_count+1
> -if ((!limit_iterations) || (iteration_count<=limit_iterations)) reread
> +reread

That file has only been touched twice, once in 1998 and once in 2006.
The diff you list above was the 1998 change.

At a guess, the 07-Jan-2006 change is right at the time of the 4.2 branch
and got caught on the wrong side of it.

	Ethan