$\qed$
-\subsection{Foreign Contents}
+\subsection{Foreign Ancestry}
Not applicable.
Simple Foreign Inclusion applies. $\qed$
-\subsection{Foreign Contents}
+\subsection{Foreign Ancestry}
Not applicable.
Simple Foreign Inclusion applies. $\qed$
-\subsection{Foreign Contents}
+\subsection{Foreign Ancestry}
Not applicable.
\[\eqn{Foreign Inclusion}{
\bigforall_{D \in \foreign} D \isin C \equiv D \leq C
}\]
-\[\eqn{Foreign Contents}{
+\[\eqn{Foreign Ancestry}{
\bigforall_{C \in \foreign}
D \le C \implies \isforeign{D}
}\]
So $D \isin C \equiv D \le C$.
}
-\subsection{Totally Foreign Contents}
+\subsection{Totally Foreign Ancestry}
Given conformant commits $A \in \set A$,
$$
\left[
\proof{
Consider some $D \le C$. If $D = C$, $\isforeign{D}$ trivially.
If $D \neq C$ then $D \le A$ where $A \in \set A$. By Foreign
-Contents of $A$, $\isforeign{D}$.
+Ancestry of $A$, $\isforeign{D}$.
}
merge any Topbloke-controlled branch into any plain git branch.
Given those conditions, Tip Merge and Merge Acyclic do not apply.
-By Foreign Contents of $L$, $\isforeign{M}$ as well.
-So by Foreign Contents for any $A \in \{L,M,R\}$,
+By Foreign Ancestry of $L$, $\isforeign{M}$ as well.
+So by Foreign Ancestry for any $A \in \{L,M,R\}$,
$\forall_{\p, D \in \py} D \not\le A$
so $\pendsof{A}{\py} = \{ \}$ and the RHS of both Merge Ends
conditions are satisifed.
$\qed$
-\subsection{Foreign Contents}
+\subsection{Foreign Ancestry}
Only relevant if $\isforeign{L}$, in which case
$\isforeign{C}$ and by Foreign Merges $\isforeign{R}$,
-so Totally Foreign Contents applies. $\qed$
+so Totally Foreign Ancestry applies. $\qed$
\subsection{Bases' Children}
True by Foreign Identical, and Foreign Inclusion of $L$.
-\subsection{Foreign Contents}
+\subsection{Foreign Ancestry}
Not applicable.
Simple Foreign Inclusion applies. $\qed$
-\subsection{Foreign Contents:}
+\subsection{Foreign Ancestry:}
Only relevant if $\isforeign{C}$, and in that case Totally
-Foreign Contents applies. $\qed$
+Foreign Ancestry applies. $\qed$
\subsection{Bases' Children:}