Re: Update on the branch surgery

[sfeam <sf...@us...>]

On Thursday, 26 October 2017 00:06:43 Eric S. Raymond wrote:
> The alternatives remain as follows:
> 
> If it were my call, I'd cut our losses - just drop the 3.7.x and 4.0
> branches entirely.  That would leave the repo in a very clean state where
> we have confidence that what is there matches its actual development
> history quite closely.

OK by me.

> The second option would be to leave the mess as it is.  I dislike this plan
> for one major reason: We know the 3.7.x branch is corrupt - its 3.7.1 state
> does not match the archived tarball.  

At least we _have_ tarballs for 3.7.1 3.7.2 3.7.3
They can be accessed as-is.
I can't find tarballs for anything between 4.0.0 and 4.2.0 anywhere on the web.

	Ethan


> The third option is the heroic, possibly overinvested one. I could insert
> a synthetic commit between the master-branch root of 4.0 and the rest
> replicating the X change to gnuplot.rot, with a change comment explaining
> the mess.  Then we could try to rectify the 3.7.x branch.
>