X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=blobdiff_plain;f=anticommit.tex;h=e4f5d482201b33bca678504b99cd9e39401b6b9a;hp=90304e08e12857df301487c46ca34be34989cd0c;hb=410132e37a1f6e95cbfa9792d63b50b9390e59e4;hpb=35c23b7d2f99196a118cf034c601b42dc31e8815

diff --git a/anticommit.tex b/anticommit.tex
index 90304e0..e4f5d48 100644
--- 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^+ \}
@@ -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$