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
(parent:
75cfdca
)
create tip wip
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 12 Mar 2012 14:29:08 +0000
(14:29 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 12 Mar 2012 14:29:08 +0000
(14:29 +0000)
article.tex
patch
|
blob
|
history
diff --git
a/article.tex
b/article.tex
index 69f530a6c3395cf8b6e0e9462612b817ceb9360f..36233ae4b7f147a2c67c7f2b96798c5feca1b4e0 100644
(file)
--- a/
article.tex
+++ b/
article.tex
@@
-538,6
+538,9
@@
Given a Topbloke base $B$, create a tip branch initial commit B.
\[ \eqn{ Ingredients }{
\patchof{B} = \pqn
}\]
+\[ \eqn{ No Sneak }{
+ \pendsof{B}{\pqy} = \{ \}
+}\]
\subsection{No Replay}
@@
-557,6
+560,19
@@
So $D \isin C \equiv D \isin \baseof{B}$.
$\qed$
+\subsection{Base Acyclic}
+
+Not applicable.
+
+\subsection{Coherence and Patch Inclusion}
+
+Consider some $D \in \py$.
+
+\subsubsection{For $\p = \pq$:}
+
+By Base Acyclic, $D \not\isin B$. So $D \isin C \equiv D = C$.
+By No Sneak, $D \le B \equiv D = C$. Thus $C \haspatch \pq$.
+
xxx up to here
\section{Anticommit}