From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 11 Mar 2012 12:44:56 +0000 (+0000)
Subject: wip anticommit foreign inclusion
X-Git-Tag: f0.2~93
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=8eec5c21633f6eb6a2709df7d8d65f576c35124b

wip anticommit foreign inclusion
---

diff --git a/article.tex b/article.tex
index b7df641..77a1098 100644
--- a/article.tex
+++ b/article.tex
@@ -520,6 +520,21 @@ So $L \nothaspatch \p \implies C \nothaspatch \p$.
 Whereas if $L \haspatch \p$, $D \isin L \equiv D \le L$.
 so $L \haspatch \p \implies C \haspatch \p$.
 
+\section{Foreign Inclusion}
+
+Consider some $D$ s.t. $\patchof{D} = \bot$.  $D \neq C$.
+So by Desired Contents $D \isin C \equiv D \isin L$.
+By Foreign Inclusion of $D$ in $L$, $D \isin L \equiv D \le L$.
+So $D \isin C \equiv D \le L$.
+
+xxx up to here
+
+By Tip Contents of $R^+$, $D \isin R^+ \equiv D \isin \baseof{R^+}$
+i.e. $\equiv D \isin R^-$.
+So by $\merge$, $D \isin C \equiv D \isin L$.
+
+Thus $D \isin C \equiv $
+
 \section{Merge}
 
 Merge commits $L$ and $R$ using merge base $M$ ($M < L, M < R$):