wip dependency insertion

[topbloke-formulae.git] / article.tex

diff --git a/article.tex b/article.tex
index c096e07474c761333a7666d5724e8294eb36d295..0ed90a67314921007898565e28874630769e8908 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -812,13 +812,13 @@ dependency.
  L \in \pqn
 }\]
 \[ \eqn{ Currently Excluded }{
- L \nothaspatch \pry
+ L \nothaspatch \pr
 }\]
 \[ \eqn{ Inserted's Ends }{
  E \in \pendsof{L}{\pry} \implies E \le R^+
 }\]
 \[ \eqn{ Others' Ends }{
- \bigforall_{\p \neq \pr, L \haspatch \p}
+ \bigforall_{\p \patchisin \L}
  E \in \pendsof{R^+}{\py} \implies E \le L
 }\]
 \[ \eqn{ Insertion Acyclic }{
@@ -855,7 +855,6 @@ $$
   \p \neq \pr \land L \nothaspatch \p : & C \nothaspatch \p
 \end{cases}
 $$
-
 \proofstarts
 ~ Consider some $D \in \py$.
 $D \neq C$ so $D \le C \equiv D \le L \lor D \le R^+$.
@@ -879,26 +878,36 @@ OK.
 
 \subsubsection{For $\p \neq \pr$:}
 
-xxx up to here
-
-By Insertion Acyclic, $D \not\isin R^+$. xxx this is wrong
-By Tip Contents for $R^+$,
-$D \isin R^+ \equiv D \isin R^- \lor (D \in \pry \land ...)$
-but $D \in \py$ so $D \not\in \pry$.  So $D \not\isin R^-$.
-By $\merge$, $D \isin C \equiv D \isin L$.
+By Exclusive Tip Contents for $R^+$ ($D \not\in \pry$ case)
+$D \isin R^+ \equiv D \isin R^-$.
+So by $\merge$, $D \isin C \equiv D \isin L$.
 
 If $L \nothaspatch \p$, $D \not\isin L$ so $C \nothaspatch \p$.  OK.
 
 If $L \haspatch \p$, Others' Ends applies; by Transitive
 Ancestors, $A \in \pancsof{R^+}{\py} \implies A \le L$.
-So $D \le R^+$, which is the same as $D \in \pancsof{R^+}{\py}$,
-$\implies D \le L$.  Thus $D le C \equiv D \le L$.
+So $D \le R^+ \implies D \le L$,
+since $D \le R^+ \equiv D \in \pancsof{R^+}{\py}$.
+Thus $D \le C \equiv D \le L$.
 And by $\haspatch$, $D \le L \equiv D \isin L$ so
 $D \isin C \equiv D \le C$.  Thus $C \haspatch \p$.
 OK.
 
 $\qed$
 
+\subsection{Foreign Inclusion}
+
+Consider some $D$ s.t. $\patchof{D} = \bot$.
+
+By Tip Contents for $R^+$, $D \isin R^+ \equiv D \isin R^-$.
+So by $\merge$, $D \isin C \equiv D \isin L$.
+
+xxx up to here, need new condition
+
+$D \neq C$.
+
+
+
 \section{Merge}
 
 Merge commits $L$ and $R$ using merge base $M$: