> Fossil simply defines it: > > Having more than one leaf in the check-in DAG is called a "fork." > > After re-reading the wiki section that you pointed out I have a much better understanding of how Fossil defines a fork. Thanks for pointing that out. What I'm surprised at, after following both discussions, is I don't recall seeing this mentioned, but perhaps it was: *Fork*
A fork is when a check-in has two or more direct (non-merge) children in the same branch. And then the example text: > Check-in 2 of figure 3 is considered a "fork" because it has two children in the same branch. Check-in 2 of figure 5 also has two > children, but each child is in a different branch, hence in figure 5, check-in 2 is considered a "branch point." Figure 3: https://www.fossil-scm.org/index.html/doc/trunk/www/branch03.gif Figure 5: https://www.fossil-scm.org/index.html/doc/trunk/www/branch05.gif My interpretation of fork was an "unmerged leaf" on the same branch - which is incorrect, according to the docs. This was also the reason I suggested "head" as a Mercurial analog. In the oft cited example of a fork in 2015 (which happens to be related to my check-in submitted by bundle export/import). My check-in is not actually the fork; the parent of my check-in is the fork. To use Ron's road analogy, if I am driving a car and I come to a fork in the road I can go left or right or however many road choices I have. The fork is the point at which I make a choice. Whichever road I choose, I drive through the fork/branch point and I am now just on a road - maybe the road ends quickly (leaf), maybe it keeps going (branch). The distinction between "fork" and "branch point" then becomes important as it gets to intent. *Branch Point* A branch point occurs when a check-in has two or more direct (non-merge) children in different branches. A branch point is similar to a fork, except that the children are in different branches. So a leaf is never a fork; it is just a leaf. Sorry if am restating what was obvious to everyone else. -J
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
