X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=anticommit.tex;h=166ae1782d6c8be8030260acb0440952479ae3c4;hb=d00298b5b6d70bd919824ab8b79d71663f3cdfa6;hp=0af8f1aba700b13905603b683a8de1d127c5b794;hpb=7dc335c17ae313c006e2283a35ca214b213ffcd9;p=topbloke-formulae.git diff --git a/anticommit.tex b/anticommit.tex index 0af8f1a..166ae17 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^+ \} @@ -61,7 +61,7 @@ $D \not\isin R^-$. Thus $D \not\isin C$. OK. By Currently Included, $D \isin L$. -By Tip Self Inpatch 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,20 +79,20 @@ $\qed$ \subsection{Unique Base} -Into Base means that $C \in \pqn$, so Unique Base is not -applicable. $\qed$ +Into Base means that $C \in \pln$, so Unique Base is not +applicable. \subsection{Tip Contents} -Again, not applicable. $\qed$ +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}