chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b1e89d6
)
create base fix base acyclic and condition
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 12 Mar 2012 14:17:50 +0000
(14:17 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 12 Mar 2012 14:17:50 +0000
(14:17 +0000)
article.tex
patch
|
blob
|
history
diff --git
a/article.tex
b/article.tex
index 44942ff2e6524da61a2d7cce059d249ab88aec61..85e09e1c470a695becbf92bfa58fcaad0dc000e8 100644
(file)
--- a/
article.tex
+++ b/
article.tex
@@
-475,7
+475,7
@@
Given $L$, create a Topbloke base branch initial commit $B$.
\patchof{L} = \pa{L} \lor \patchof{L} = \bot
}\]
\[ \eqn{ Non-recursion }{
\patchof{L} = \pa{L} \lor \patchof{L} = \bot
}\]
\[ \eqn{ Non-recursion }{
- L \not\
in
\pa{Q}
+ L \not\
haspatch
\pa{Q}
}\]
\subsection{No Replay}
}\]
\subsection{No Replay}
@@
-492,14
+492,9
@@
Not applicable.
\subsection{Base Acyclic}
\subsection{Base Acyclic}
-Consider some $D \isin B$. If $D = B$, $D \in \pn$, OK.
-
-If $D \neq B$, $D \isin L$. By No Replay of $D$ in $L$, $D \le L$.
-Thus by Foreign Contents of $L$, $\patchof{D} = \bot$. OK.
-
-xxx this is wrong
-
-$\qed$
+Consider some $D \isin B$. If $D = B$, $D \in \pan{Q}$.
+If $D \neq B$, $D \isin L$, and by Non-recursion
+$D \not\in \pay{Q}$. $\qed$
\subsection{Coherence and Patch Inclusion}
\subsection{Coherence and Patch Inclusion}