$\displaystyle \bigforall_{D \in \py} D \not\isin C $.
~ Informally, $C$ has none of the contents of $\p$.
-Non-Topbloke commits are $\nothaspatch \p$ for all $\p$. This
+Commits on Non-Topbloke branches are $\nothaspatch \p$ for all $\p$. This
includes commits on plain git branches made by applying a Topbloke
patch. If a Topbloke
patch is applied to a non-Topbloke branch and then bubbles back to
}
\subsection{Exclusive Tip Contents}
+Given Base Acyclic for $C$,
$$
\bigforall_{C \in \py}
\neg \Bigl[ D \isin \baseof{C} \land ( D \in \py \land D \le C )
}\]
\subsection{Tip Self Inpatch}
+Given Exclusive Tip Contents and Base Acyclic for $C$,
$$
\bigforall_{C \in \py} C \haspatch \p
$$
\subsection{Exact Ancestors}
$$
\bigforall_{ C \hasparents \set{R} }
+ \left[
D \le C \equiv
( \mathop{\hbox{\huge{$\vee$}}}_{R \in \set R} D \le R )
\lor D = C
+ \right]
$$
\proof{ ~ Trivial.}
by the LHS. And $A \le A''$.
}
-\subsection{Calculation Of Ends}
+\subsection{Calculation of Ends}
$$
\bigforall_{C \hasparents \set A}
\pendsof{C}{\set P} =
\left[
{C \hasparents \set A} \land
\\
+ \bigforall_{D}
\left(
- D \isin C \implies
+ D \isin C \implies
D = C \lor
\Largeexists_{A \in \set A} D \isin A
\right)
- \right] \implies \left[
+ \right] \implies \left[ \bigforall_{D}
D \isin C \implies D \le C
\right]
$$
\subsection{Totally Foreign Contents}
$$
- \bigforall_{C \hasparents \set A}
\left[
+ C \hasparents \set A \land
\patchof{C} = \bot \land
\bigforall_{A \in \set A} \patchof{A} = \bot
\right]
\implies
\left[
+ \bigforall_{D}
D \le C
\implies
\patchof{D} = \bot
set $\{ \pq | C \haspatch \pq \}$. Whether $C \haspatch \pq$
is in stated
(in terms of $I \haspatch \pq$ or $I \nothaspatch \pq$
-for the ingredients $I$),
+for the ingredients $I$)
in the proof of Coherence for each kind of commit.
$\pendsof{C}{\pq^+}$ is computed, for all Topbloke-generated commits,
Ingredients Prevent Replay applies. $\qed$
\subsection{Unique Base}
-If $L, C \in \py$ then by Calculation of Ends for
-$C, \py, C \not\in \py$:
+If $L, C \in \py$ then by Calculation of Ends,
$\pendsof{C}{\pn} = \pendsof{L}{\pn}$ so
$\baseof{C} = \baseof{L}$. $\qed$
\[ D \isin C \equiv D \isin \baseof{L} \lor ( D \in \py \land D \le L )
\lor D = C \]
Since $D = C \implies D \in \py$,
-and substituting in $\baseof{C}$, this gives:
+and substituting in $\baseof{C}$, from Unique Base above, this gives:
\[ D \isin C \equiv D \isin \baseof{C} \lor
(D \in \py \land D \le L) \lor
(D = C \land D \in \py) \]
\section{Create Base}
-Given $L$, create a Topbloke base branch initial commit $B$.
+Given a starting point $L$ and a proposed patch $\pq$,
+create a Topbloke base branch initial commit $B$.
\gathbegin
B \hasparents \{ L \}
\gathnext
\subsection{Coherence and Patch Inclusion}
-Consider some $D \in \p$.
+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$.
\section{Create Tip}
-Given a Topbloke base $B$, create a tip branch initial commit B.
+Given a Topbloke base $B$ for a patch $\pq$,
+create a tip branch initial commit B.
\gathbegin
C \hasparents \{ B \}
\gathnext
Consider some arbitrary commit $D$. If $D = C$, trivially satisfied.
-If $D \neq C$, $D \isin C \equiv D \isin B$.
+If $D \neq C$, $D \isin C \equiv D \isin B$,
+which by Unique Base, above, $ \equiv D \isin \baseof{B}$.
By Base Acyclic of $B$, $D \isin B \implies D \not\in \pqy$.
-So $D \isin C \equiv D \isin \baseof{B}$.
+
$\qed$
\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$.
+By No Sneak, $D \not\le B$ so $D \le C \equiv D = C$. Thus $C \haspatch \pq$.
\subsubsection{For $\p \neq \pq$:}
By Currently Included, $D \isin L$.
-By Tip Self Inpatch, $D \isin R^+ \equiv D \le R^+$, but by
+By Tip Self Inpatch for $R^+$, $D \isin R^+ \equiv D \le R^+$, but by
by Unique Tip, $D \le R^+ \equiv D \le L$.
So $D \isin R^+$.
\subsubsection{For $L \nothaspatch \p, R \nothaspatch \p$:}
$D \not\isin L \land D \not\isin R$. $C \not\in \py$ (otherwise $L
-\in \py$ ie $L \haspatch \p$ by Tip Self Inpatch). So $D \neq C$.
+\in \py$ ie $L \haspatch \p$ by Tip Self Inpatch for $L$). So $D \neq C$.
Applying $\merge$ gives $D \not\isin C$ i.e. $C \nothaspatch \p$.
\subsubsection{For $L \haspatch \p, R \haspatch \p$:}
(which suffices by definition of $\haspatch$ and $\nothaspatch$).
Consider $D = C$: Thus $C \in \py, L \in \py$, and by Tip
-Self Inpatch $L \haspatch \p$, so $L=Y, R=X$. By Tip Merge,
+Self Inpatch for $L$, $L \haspatch \p$, so $L=Y, R=X$. By Tip Merge,
$M=\baseof{L}$. So by Base Acyclic $D \not\isin M$, i.e.
$M \nothaspatch \p$. And indeed $D \isin C$ and $D \le C$. OK.
~ian / topbloke-formulae.git / blobdiff