Re: Successful branch-5-0-stable transplant

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

On 10/24/2017 08:00 PM, Eric S. Raymond wrote:
> I am pleased to report that the first branch rerooting -
> branch-5-0-stable - has worked (head content is identical to CVS) and
> have been incorporated into the reconvert script.
> 
> One down, five to go.

I've been looking at this a little bit using the diff utility, but it 
requires some inference from the checkin comments to project backward a 
little further than the first commits in a branch.  Without going into 
detail, I'll tell you what I have so far that might speed things for a 
couple other branches.

First, that oldest branch I couldn't make sense of and I think it 
actually may be bogus.  Rather, it might be that those 3.x series 
commits should actually be mixed in with the master branch.  We'll come 
back to this one.

[7/7/04 12:34 PM] Child: Bugfix: Incorrect brace movement cause lost key 
presses.
git -C branch_reference checkout 536b2f37fdc8438459e7c7b0f44132fcd2204114
---
MY BEST GUESS AT THE BRANCH POINT IS:
commit 093383fb4f9250b58d832fb10e581d90f48abb9c
Author: Ethan Merritt <xxxxxx@xxxxxx>
Date:   Wed Jun 30 22:03:30 2004 -0700
     #include gp_time.h
git -C root_reference checkout 093383fb4f9250b58d832fb10e581d90f48abb9c
diff -ur --exclude=".git" branch_reference/ root_reference/ | grep "^-"| 
grep -v "^---" | wc -l
diff -ur --exclude=".git" branch_reference/ root_reference/ | grep "^+"| 
grep -v "^+++" | wc -l
23 + 10
---
The distance being quite small and the commit in master after this is 
  "Renumbered head trunk version to 4.1.0", which is likely the first 
commit after the bifurcation.  Note that Jun 30 is a ways from July 7, 
but that first commit on the new branch is a fix that Ethan also wanted 
to include in the stable release branch.


[10/1/06 10:17 AM] Child: Jump to version 4.2, 1st release candidate.
git -C branch_reference checkout e14ada2e7b0ae4f80d8abeffb5a27d8587a3bbed
---
MY BEST GUESS AT THE BRANCH POINT IS:
commit e18d4e5da418c2ad5a98a2aff3237088aeee01c8
Author: Hans-Bernhard Broeker <xxxxxx@xxxxxx>
Date:   Sun Oct 1 17:11:57 2006 +0200
     Jump to version 4.2, 1st release candidate.
git -C root_reference checkout e18d4e5da418c2ad5a98a2aff3237088aeee01c8
diff -ur --exclude=".git" branch_reference/ root_reference/ | grep "^-"| 
grep -v "^---" | wc -l
diff -ur --exclude=".git" branch_reference/ root_reference/ | grep "^+"| 
grep -v "^+++" | wc -l
2 + 2
---
In this case HBB specifically made a note about branching.

Dan