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
structure: add document end marker
[topbloke-formulae.git]
/
create-base.tex
diff --git
a/create-base.tex
b/create-base.tex
index b429e40b931681edfdefe822de1429a7f00ae37c..9325091196c21b02e9ffbe047e17eb9ac4a14934 100644
(file)
--- a/
create-base.tex
+++ b/
create-base.tex
@@
-13,7
+13,7
@@
create a Topbloke base branch initial commit $B$.
\subsection{Conditions}
\[ \eqn{ Create Acyclic }{
\subsection{Conditions}
\[ \eqn{ Create Acyclic }{
- \pendsof{L}{\pqy} = \{ \}
+ L \nothaspatch \pq
}\]
\subsection{No Replay}
}\]
\subsection{No Replay}
@@
-31,8
+31,7
@@
Not applicable.
\subsection{Base Acyclic}
Consider some $D \isin B$. If $D = B$, $D \in \pqn$.
\subsection{Base Acyclic}
Consider some $D \isin B$. If $D = B$, $D \in \pqn$.
-If $D \neq B$, $D \isin L$, so by No Replay $D \le L$
-and by Create Acyclic
+If $D \neq B$, $D \isin L$, so by Create Acyclic
$D \not\in \pqy$. $\qed$
\subsection{Coherence and Patch Inclusion}
$D \not\in \pqy$. $\qed$
\subsection{Coherence and Patch Inclusion}
@@
-41,10
+40,14
@@
Consider some $D \in \py$.
$B \not\in \py$ so $D \neq B$. So $D \isin B \equiv D \isin L$
and $D \le B \equiv D \le L$.
$B \not\in \py$ so $D \neq B$. So $D \isin B \equiv D \isin L$
and $D \le B \equiv D \le L$.
-Thus $L \haspatch \p \
implies
B \haspatch P$
-and $L \nothaspatch \p \
implies
B \nothaspatch P$.
+Thus $L \haspatch \p \
equiv
B \haspatch P$
+and $L \nothaspatch \p \
equiv
B \nothaspatch P$.
-$\qed$.
+$\qed$
+
+\subsection{Unique Tips:}
+
+Single Parent Unique Tips applies. $\qed$
\subsection{Foreign Inclusion}
\subsection{Foreign Inclusion}