Foreign Ancestry: rename from Foreign Contents (and Totally Foreign Ancestry too)

diff --git a/anticommit.tex b/anticommit.tex
index a50ed51c2814c7c3257c91bf6dea55a94534051d..cbe7998fa684c6e1f49bab615dd8948e00a8632d 100644 (file)
--- a/anticommit.tex
+++ b/anticommit.tex
@@ -140,7 +140,7 @@ Thus $D \isin C \equiv D \le C$.
 
 $\qed$
 
 
 $\qed$
 

-\subsection{Foreign Contents}
+\subsection{Foreign Ancestry}

 
 Not applicable.
 
 
 Not applicable.
 

diff --git a/create-base.tex b/create-base.tex
index 0b70ee4a33187289503af3c93e95c014b7c9c261..cc99af8e489d3e65db8264d5f55e01026684c668 100644 (file)
--- a/create-base.tex
+++ b/create-base.tex
@@ -56,7 +56,7 @@ Single Parent Unique Tips applies.  $\qed$
 
 Simple Foreign Inclusion applies. $\qed$
 
 
 Simple Foreign Inclusion applies. $\qed$
 

-\subsection{Foreign Contents}
+\subsection{Foreign Ancestry}

 
 Not applicable.
 
 
 Not applicable.
 

diff --git a/create-tip.tex b/create-tip.tex
index 7dec4cb0d7d81b03adb8eb331934137abbba9ca1..57e9b4c9f54c3ba39bede6bf4cb47caaf2d751d1 100644 (file)
--- a/create-tip.tex
+++ b/create-tip.tex
@@ -76,7 +76,7 @@ Single Parent Unique Tips applies.  $\qed$
 
 Simple Foreign Inclusion applies.  $\qed$
 
 
 Simple Foreign Inclusion applies.  $\qed$
 

-\subsection{Foreign Contents}
+\subsection{Foreign Ancestry}

 
 Not applicable.
 
 
 Not applicable.
 

diff --git a/invariants.tex b/invariants.tex
index 28647658cb30190e30a2f93a658757a81f8ddf59..ac0558a82bd9fd202ba0e308d543801eba8a1b4c 100644 (file)
--- a/invariants.tex
+++ b/invariants.tex
@@ -24,7 +24,7 @@ We maintain these each time we construct a new commit. \\
 \[\eqn{Foreign Inclusion}{
   \bigforall_{D \in \foreign} D \isin C \equiv D \leq C
 }\]
 \[\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}
 }\]
   \bigforall_{C \in \foreign}
     D \le C \implies \isforeign{D}
 }\]

diff --git a/lemmas.tex b/lemmas.tex
index 23e22f3285bbc2ec8544714a1ed4d8a04479121d..8efa09c9bac137dcdca9e6d59531ec674128b1da 100644 (file)
--- a/lemmas.tex
+++ b/lemmas.tex
@@ -187,7 +187,7 @@ And by Exact Ancestors $D \le L \equiv D \le C$.
 So $D \isin C \equiv D \le C$.
 }
 
 So $D \isin C \equiv D \le C$.
 }
 

-\subsection{Totally Foreign Contents}
+\subsection{Totally Foreign Ancestry}

 Given conformant commits $A \in \set A$,
 $$
    \left[
 Given conformant commits $A \in \set A$,
 $$
    \left[


@@ -206,6 +206,6 @@ $$
 \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
 \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}$.

 }
 
 }
 

diff --git a/merge.tex b/merge.tex
index 881dd249cce6b73a0a97e83b6173383af844c3df..1d22aec19d64ddcf5fd357660c3ca9580e3f546a 100644 (file)
--- a/merge.tex
+++ b/merge.tex
@@ -79,8 +79,8 @@ branch without Topbloke's assistance, it is also forbidden to
 merge any Topbloke-controlled branch into any plain git branch.
 
 Given those conditions, Tip Merge and Merge Acyclic do not apply.
 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.
 $\forall_{\p, D \in \py} D \not\le A$
 so $\pendsof{A}{\py} = \{ \}$ and the RHS of both Merge Ends
 conditions are satisifed.


@@ -320,11 +320,11 @@ OK
 
 $\qed$
 
 
 $\qed$
 

-\subsection{Foreign Contents}
+\subsection{Foreign Ancestry}

 
 Only relevant if $\isforeign{L}$, in which case
 $\isforeign{C}$ and by Foreign Merges $\isforeign{R}$,
 
 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}
 
 
 \subsection{Bases' Children}
 

diff --git a/pseudomerge.tex b/pseudomerge.tex
index a8ba08a6ebcaf247ac27eb89aa5f5adc658e2dba..27b2e528525bef39cd8a2bfe8556389cac0ff5c7 100644 (file)
--- a/pseudomerge.tex
+++ b/pseudomerge.tex
@@ -90,7 +90,7 @@ Explicitly dealt with by our Unique Tips condition.
 
 True by Foreign Identical, and Foreign Inclusion of $L$.
 
 
 True by Foreign Identical, and Foreign Inclusion of $L$.
 

-\subsection{Foreign Contents}
+\subsection{Foreign Ancestry}

 
 Not applicable.
 
 
 Not applicable.
 

diff --git a/simple.tex b/simple.tex
index 2a2501b29e6355d8046ec1eb08ef8c14eb3574c3..ffd2d8d0ca378f2c58e48ac0f33bb792e4d26f45 100644 (file)
--- a/simple.tex
+++ b/simple.tex
@@ -98,10 +98,10 @@ Single Parent Unique Tips applies.  $\qed$
 
 Simple Foreign Inclusion applies.  $\qed$
 
 
 Simple Foreign Inclusion applies.  $\qed$
 

-\subsection{Foreign Contents:}
+\subsection{Foreign Ancestry:}

 
 Only relevant if $\isforeign{C}$, and in that case Totally
 
 Only relevant if $\isforeign{C}$, and in that case Totally

-Foreign Contents applies. $\qed$
+Foreign Ancestry applies. $\qed$

 
 \subsection{Bases' Children:}
 
 
 \subsection{Bases' Children:}