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 - clarify Merge Coherence (for neither haspatch)
[topbloke-formulae.git]
/
simple.tex
diff --git
a/simple.tex
b/simple.tex
index 9b556ed0cd3cae33726e86812e423eb99ba4b5de..dfcf907fbb9ea6d43ddbd1ade98f8eaea57f6c38 100644
(file)
--- a/
simple.tex
+++ b/
simple.tex
@@
-47,7
+47,7
@@
$L$, $D \isin C \implies D \not\in \py$.
$\qed$
$\qed$
-\subsection{Coherence and
patch i
nclusion}
+\subsection{Coherence and
Patch I
nclusion}
Need to consider $D \in \py$
Need to consider $D \in \py$
@@
-63,7
+63,9
@@
$ D \isin C \equiv \ldots \lor \true \text{ so } D \haspatch C $.
Ancestors: $ D \le C \equiv D \le L $.
Contents: $ D \isin C \equiv D \isin L \lor f $
Ancestors: $ D \le C \equiv D \le L $.
Contents: $ D \isin C \equiv D \isin L \lor f $
-so $ D \isin C \equiv D \isin L $.
+so $ D \isin C \equiv D \isin L $, i.e. $ C \zhaspatch P $.
+By $\haspatch$ for $L$, $\exists_{F \in \py} F \le L$
+and this $F$ is also $\le C$. So $\haspatch$.
So:
\[ L \haspatch \p \implies C \haspatch \p \]
So:
\[ L \haspatch \p \implies C \haspatch \p \]