chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wip exclusive haspatch - notation
[topbloke-formulae.git]
/
anticommit.tex
diff --git
a/anticommit.tex
b/anticommit.tex
index 0af8f1aba700b13905603b683a8de1d127c5b794..166ae1782d6c8be8030260acb0440952479ae3c4 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 }{
R^+ \in \pry \land R^- = \baseof{R^+}
}\]
\[ \eqn{ Into Base }{
- L \in \p
q
n
+ L \in \p
l
n
}\]
\[ \eqn{ Unique Tip }{
\pendsof{L}{\pry} = \{ R^+ \}
}\]
\[ \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 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^+$.
by Unique Tip, $D \le R^+ \equiv D \le L$.
So $D \isin R^+$.
@@
-79,20
+79,20
@@
$\qed$
\subsection{Unique Base}
\subsection{Unique Base}
-Into Base means that $C \in \p
q
n$, so Unique Base is not
-applicable.
$\qed$
+Into Base means that $C \in \p
l
n$, so Unique Base is not
+applicable.
\subsection{Tip Contents}
\subsection{Tip Contents}
-Again, not applicable.
$\qed$
+Again, not applicable.
\subsection{Base Acyclic}
\subsection{Base Acyclic}
-By Into Base and Base Acyclic for $L$, $D \isin L \implies D \not\in \p
q
y$.
-And by Into Base $C \not\in \p
q
y$.
+By Into Base and Base Acyclic for $L$, $D \isin L \implies D \not\in \p
l
y$.
+And by Into Base $C \not\in \p
l
y$.
Now from Desired Contents, above, $D \isin C
\implies D \isin L \lor D = C$, which thus
Now from Desired Contents, above, $D \isin C
\implies D \isin L \lor D = C$, which thus
-$\implies D \not\in \p
q
y$. $\qed$.
+$\implies D \not\in \p
l
y$. $\qed$.
\subsection{Coherence and Patch Inclusion}
\subsection{Coherence and Patch Inclusion}