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
pseudomerge: Bases' Children
[topbloke-formulae.git]
/
create-base.tex
diff --git
a/create-base.tex
b/create-base.tex
index 778999423bfa6adc7692cea9d84844adf97dd3c9..0b70ee4a33187289503af3c93e95c014b7c9c261 100644
(file)
--- a/
create-base.tex
+++ b/
create-base.tex
@@
-13,7
+13,10
@@
create a Topbloke base branch initial commit $B$.
\subsection{Conditions}
\[ \eqn{ Create Acyclic }{
\subsection{Conditions}
\[ \eqn{ Create Acyclic }{
- \pendsof{L}{\pqy} = \{ \}
+ L \nothaspatch \pq
+}\]
+\[ \eqn{ Ingredients }{
+ \patchof L = \foreign \lor \patchof L = \py
}\]
\subsection{No Replay}
}\]
\subsection{No Replay}
@@
-31,8
+34,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}
@@
-46,6
+48,10
@@
and $L \nothaspatch \p \equiv B \nothaspatch P$.
$\qed$
$\qed$
+\subsection{Unique Tips:}
+
+Single Parent Unique Tips applies. $\qed$
+
\subsection{Foreign Inclusion}
Simple Foreign Inclusion applies. $\qed$
\subsection{Foreign Inclusion}
Simple Foreign Inclusion applies. $\qed$
@@
-54,3
+60,7
@@
Simple Foreign Inclusion applies. $\qed$
Not applicable.
Not applicable.
+\subsection{Bases' Children}
+
+Not applicable, by Ingredients.
+