wip exclusive haspatch - fix Merge Coherence (for both haspatch)

[topbloke-formulae.git] / anticommit.tex

diff --git a/anticommit.tex b/anticommit.tex
index 47e0a9b395a2893ad53ebf57dbab39b47fec064b..e4f5d482201b33bca678504b99cd9e39401b6b9a 100644 (file)
--- a/anticommit.tex
+++ b/anticommit.tex
@@ -17,7 +17,7 @@ Used for removing a branch dependency.
 R^+ \in \pry \land R^- = \baseof{R^+}
 }\]
 \[ \eqn{ Into Base }{
- L \in \pqn
+ L \in \pln
 }\]
 \[ \eqn{ Unique Tip }{
  \pendsof{L}{\pry} = \{ R^+ \}
@@ -61,7 +61,7 @@ $D \not\isin R^-$.  Thus $D \not\isin C$.  OK.
 
 By Currently Included, $D \isin L$.
 
-By Tip Self Contents for $R^+$, $D \isin R^+ \equiv D \le R^+$, but by
+By Tip Own Contents for $R^+$, $D \isin R^+ \equiv D \le R^+$, but by
 by Unique Tip, $D \le R^+ \equiv D \le L$.
 So $D \isin R^+$.
 
@@ -79,7 +79,7 @@ $\qed$
 
 \subsection{Unique Base}
 
-Into Base means that $C \in \pqn$, so Unique Base is not
+Into Base means that $C \in \pln$, so Unique Base is not
 applicable.
 
 \subsection{Tip Contents}
@@ -88,11 +88,11 @@ Again, not applicable.
 
 \subsection{Base Acyclic}
 
-By Into Base and Base Acyclic for $L$, $D \isin L \implies D \not\in \pqy$.
-And by Into Base $C \not\in \pqy$.
+By Into Base and Base Acyclic for $L$, $D \isin L \implies D \not\in \ply$.
+And by Into Base $C \not\in \ply$.
 Now from Desired Contents, above, $D \isin C
 \implies D \isin L \lor D = C$, which thus
-$\implies D \not\in \pqy$.  $\qed$.
+$\implies D \not\in \ply$.  $\qed$.
 
 \subsection{Coherence and Patch Inclusion}
 
@@ -109,8 +109,10 @@ By Desired Contents, $D \isin C \equiv D \isin L$
 If $L \nothaspatch \p$, $D \not\isin L$ so $D \not\isin C$.
 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$.
+Whereas, if $L \haspatch \p$, $D \isin L \equiv D \le L$,
+so $C \zhaspatch \p$;
+and $\exists_{F \in \py} F \le L$ so this $F \le C$.
+Thus $\p \neq R \land L \haspatch \p \implies C \haspatch \p$.
 
 $\qed$