Re: Update on the branch surgery

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

On Wednesday, October 25, 2017 10:16:29 AM PDT Eric S. Raymond wrote:
> 4.2:
> 
>     HBB:
> >	branch-4-2-stable:1.2224.0.2
> >
> >revision 1.2224
> >date: 2006/10/01 12:11:58;  author: broeker;  state: Exp;  lines: +15 -7
> >branches:  1.2224.2;
> >Reorganize top-level configuration of automake and autoconf to allow
> >version-testing automake.
> 
>     Dan:
> >[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.
> 
>     I think Dan got this one wrong; /Jump to version 4.2/ looks to me
>     like branch first commit, not the root point (see the digram).
> 
>     Matters are slightly complicated by the fact that that content
>     matches to two different commits.
> 
>     2006-10-01T15:17:17Z  :3688 Jump to version 4.2, 1st release
> candidate. 2006-10-01T15:11:57Z :22184 Jump to version 4.2, 1st release
> candidate.
> 
>     The later one looks like a manual merge onto the mainline, so I
>     have rooted the earlier one to /Reorganize top-level configuration/.

The logical branch point for branch-4-2-stable would have been immediately 
before the 2006-10-01 "jump to version 4.2" commit.
e18d4e5da418c2ad5a98a2aff3237088aeee01c8

I don't know whether the "branch point" terminology used by git
refers to the last common ancester or the first commit after divergence.
Looks like "jump to version 4.2" is the latter (first commit after split), 
while "re-organize top level configuration" is the former (last common 
ancestor).

	Ethan