foreign notation: change \bot to \foreign everywhere

[topbloke-formulae.git] / merge.tex

diff --git a/merge.tex b/merge.tex
index 6ff5d81e51d67193858caf678fa0a1185a60c7fd..6ba1387886a8bc6f90fb4cd5254ce544f962e4e7 100644 (file)
--- a/merge.tex
+++ b/merge.tex
@@ -56,19 +56,19 @@ satisfied; in particular, provided that $L \ge \baseof{R}$.
     , \text{where} \{J,K\} = \{L,R\}
 }\]
 \[ \eqn{ Foreign Merges }{
-    \patchof{L} = \bot \implies \patchof{R} = \bot
+    \patchof{L} = \foreign \implies \patchof{R} = \foreign
 }\]
 
 \subsection{Non-Topbloke merges}
 
-We require both $\patchof{L} = \bot$ and $\patchof{R} = \bot$
+We require both $\patchof{L} = \foreign$ and $\patchof{R} = \foreign$
 (Foreign Merges, above).
 I.e. not only is it forbidden to merge into a Topbloke-controlled
 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$, $\patchof{M} = \bot$ as well.
+By Foreign Contents of $L$, $\patchof{M} = \foreign$ as well.
 So by Foreign Contents 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
@@ -280,7 +280,7 @@ $\qed$
 
 \subsection{Foreign Inclusion}
 
-Consider some $D$ s.t. $\patchof{D} = \bot$.
+Consider some $D$ s.t. $\patchof{D} = \foreign$.
 By Foreign Inclusion of $L, M, R$:
 $D \isin L \equiv D \le L$;
 $D \isin M \equiv D \le M$;
@@ -311,6 +311,6 @@ $\qed$
 
 \subsection{Foreign Contents}
 
-Only relevant if $\patchof{L} = \bot$, in which case
-$\patchof{C} = \bot$ and by Foreign Merges $\patchof{R} = \bot$,
+Only relevant if $\patchof{L} = \foreign$, in which case
+$\patchof{C} = \foreign$ and by Foreign Merges $\patchof{R} = \foreign$,
 so Totally Foreign Contents applies.  $\qed$