pseudomerge: new Ingredients condition

[topbloke-formulae.git] / create-base.tex

diff --git a/create-base.tex b/create-base.tex
index b429e40b931681edfdefe822de1429a7f00ae37c..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 }{
- \pendsof{L}{\pqy} = \{ \}
+ L \nothaspatch \pq
+}\]
+\[ \eqn{ Ingredients }{
+ \patchof L = \foreign \lor \patchof L = \py
 }\]
 
 \subsection{No Replay}
@@ -31,8 +34,7 @@ Not applicable.
 \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}
@@ -41,10 +43,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$.
 
-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$
+
+\subsection{Unique Tips:}
 
-$\qed$.
+Single Parent Unique Tips applies.  $\qed$
 
 \subsection{Foreign Inclusion}
 
@@ -54,3 +60,7 @@ Simple Foreign Inclusion applies. $\qed$
 
 Not applicable.
 
+\subsection{Bases' Children}
+
+Not applicable, by Ingredients.
+