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: Fix Foreign Inclusion
[topbloke-formulae.git]
/
create-base.tex
diff --git
a/create-base.tex
b/create-base.tex
index 800fcd7faf08042c7bbb7406d5155fb9bef79bb4..cc99af8e489d3e65db8264d5f55e01026684c668 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}
@@
-54,7
+56,11
@@
Single Parent Unique Tips applies. $\qed$
Simple Foreign Inclusion applies. $\qed$
Simple Foreign Inclusion applies. $\qed$
-\subsection{Foreign
Contents
}
+\subsection{Foreign
Ancestry
}
Not applicable.
Not applicable.
+\subsection{Bases' Children}
+
+Not applicable, by Ingredients.
+