Re: Update on the branch surgery

[Daniel J S. <dan...@ie...>]

On 10/25/2017 12:16 PM, Eric S. Raymond wrote:
[snip]
> To sum up: everyone agrees on the root points for 5.2, 5.0, 4.0, and 4.4.
> 
> I think Dan made an error locating the 4.2 root point, but I could be
> wrong. We also have differing ideas about the 4.6 root.

4.2: Yes, I think I'm wrong there, having a second look.  I agree that 
the first two commits on trunk and branch having the same version number 
change is slightly odd (root uses the word "Changed" where branch uses 
the word "Bumped"), but different people do things differently. 
However, there are two checkins of the same message: "Jump to version 
4.2, 1st release candidate."  One wouldn't branch off of a point and use 
the same message for the first change.  So the branch point is

Author: Hans-Bernhard Broeker <xxxxxx@xxxxxx>
Date:   Sun Oct 1 14:11:58 2006 +0200
     Reorganize top-level configuration of automake and autoconf...
     ...to allow version-testing automake.

4.6: I think I could go along with your choice on this one as well.  It 
looks to me that Ethan first prepped for the branch by updating dates in 
the checkin "*** empty log message ***", but didn't change the actual 
version number at that time.  Bifurcating at this point would have the 
updated version number on the 4.6 branch as the first change, whereas 
the trunk's first change is continued development and nothing to do with 
version number.  I was looking for a common pattern of branching I 
guess, but as noted different people do things differently.  So, yeah, 
the branch point is

*** empty log message ***
Ethan A Merritt<xxxxxx@xxxxxx>
11/21/11 11:08 PM

but note that this author date (not commit date) is 11/21 where the 
previous change is 11/22.  The commit date (11/23 or 11/24 depending on 
time zone) seems to be in order though.


> I'm going to to do some more analysis on the 3.7 branch, but the odds
> that we'll have to write it off look pretty high.

I'll look at this a bit more.  For those with historical knowledge, I'm 
going to write some checkin comments here that come from searching, but 
only those that seem like they could give a clue about when the first 
branch was done.  (I'm using qgit, which has some nice searching and 
file features.)  Let me know if they ring a bell:

"branch"
New function gp_strdup, from cvs MAIN branch.
Updated from cvs MAIN branch
New files from my branched-off 'monster patch'
Merged the pm3d branch back to MAIN
Merge axis-branch into MAIN. Lots of changes all over the places
a few changes after merging the axis branch
make the branched version compile under OS/2
Updated from aquaterm cvs bugfix branch.

"merge"
Final fixes for merger.
Update from current automake (lost in merge).
Some cleanups/fixes after the merge.

Dan