X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=blobdiff_plain;f=article.tex;h=7630745d41eaf60ca7369bd99e7ec29ea03cbe98;hp=0428df707a2978eae6c336b40447f29b5b820385;hb=c2932ba812fa6fdf7b03615dd4a8709449cd8983;hpb=1814499fa14d3774567205fa57a95b3adbfe4fb5

diff --git a/article.tex b/article.tex
index 0428df7..7630745 100644
--- a/article.tex
+++ b/article.tex
@@ -196,6 +196,10 @@ We maintain these each time we construct a new commit. \\
 \[\eqn{Foreign Inclusion:}{
   \bigforall_{D \text{ s.t. } \patchof{D} = \bot} D \isin C \equiv D \leq C
 }\]
+\[\eqn{Foreign Contents:}{
+  \bigforall_{C \text{ s.t. } \patchof{C} = \bot}
+    D \le C \implies \patchof{D} = \bot
+}\]
 
 \section{Some lemmas}
 
@@ -289,6 +293,21 @@ by the LHS.  And $A \le A''$.
 }\]
 xxx proof tbd
 
+\[ \eqn{Totally Foreign Contents:}{
+  \bigforall_{C \hasparents \set A}
+   \left[
+    \patchof{C} = \bot \land
+      \bigforall_{A \in \set A} \patchof{A} = \bot
+   \right]
+  \implies
+   \left[
+    D \isin C
+   \implies
+    \patchof{D} = \bot
+   \right]
+}\]
+xxx proof tbd
+
 \subsection{No Replay for Merge Results}
 
 If we are constructing $C$, with,
@@ -484,7 +503,7 @@ xxx unfinished
 
 \section{Create Tip}
 
-xxx tbd\
+xxx tbd
 
 \section{Anticommit}
 
@@ -598,7 +617,7 @@ so $L \haspatch \p \implies C \haspatch \p$.
 
 $\qed$
 
-\section{Foreign Inclusion}
+\subsection{Foreign Inclusion}
 
 Consider some $D$ s.t. $\patchof{D} = \bot$.  $D \neq C$.
 So by Desired Contents $D \isin C \equiv D \isin L$.