From ff4ffb2eb74387bab00f6f7536f1037bb9a9f0aa Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 10 Aug 2013 14:22:02 +0100 Subject: [PATCH] Foreign Ancestry: rename from Foreign Contents (and Totally Foreign Ancestry too) --- anticommit.tex | 2 +- create-base.tex | 2 +- create-tip.tex | 2 +- invariants.tex | 2 +- lemmas.tex | 4 ++-- merge.tex | 8 ++++---- pseudomerge.tex | 2 +- simple.tex | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/anticommit.tex b/anticommit.tex index a50ed51..cbe7998 100644 --- a/anticommit.tex +++ b/anticommit.tex @@ -140,7 +140,7 @@ Thus $D \isin C \equiv D \le C$. $\qed$ -\subsection{Foreign Contents} +\subsection{Foreign Ancestry} Not applicable. diff --git a/create-base.tex b/create-base.tex index 0b70ee4..cc99af8 100644 --- a/create-base.tex +++ b/create-base.tex @@ -56,7 +56,7 @@ Single Parent Unique Tips applies. $\qed$ Simple Foreign Inclusion applies. $\qed$ -\subsection{Foreign Contents} +\subsection{Foreign Ancestry} Not applicable. diff --git a/create-tip.tex b/create-tip.tex index 7dec4cb..57e9b4c 100644 --- a/create-tip.tex +++ b/create-tip.tex @@ -76,7 +76,7 @@ Single Parent Unique Tips applies. $\qed$ Simple Foreign Inclusion applies. $\qed$ -\subsection{Foreign Contents} +\subsection{Foreign Ancestry} Not applicable. diff --git a/invariants.tex b/invariants.tex index 2864765..ac0558a 100644 --- 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 Contents}{ +\[\eqn{Foreign Ancestry}{ \bigforall_{C \in \foreign} D \le C \implies \isforeign{D} }\] diff --git a/lemmas.tex b/lemmas.tex index 23e22f3..8efa09c 100644 --- 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$. } -\subsection{Totally Foreign Contents} +\subsection{Totally Foreign Ancestry} 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 -Contents of $A$, $\isforeign{D}$. +Ancestry of $A$, $\isforeign{D}$. } diff --git a/merge.tex b/merge.tex index 881dd24..1d22aec 100644 --- 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. -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. @@ -320,11 +320,11 @@ OK $\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} diff --git a/pseudomerge.tex b/pseudomerge.tex index a8ba08a..27b2e52 100644 --- 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$. -\subsection{Foreign Contents} +\subsection{Foreign Ancestry} Not applicable. diff --git a/simple.tex b/simple.tex index 2a2501b..ffd2d8d 100644 --- a/simple.tex +++ b/simple.tex @@ -98,10 +98,10 @@ Single Parent Unique Tips applies. $\qed$ 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:} -- 2.30.2