X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=create-tip.tex;h=3e8876021c23c08b0d46c5b7a86d8378a428c38a;hb=refs%2Ftags%2Ff0.3;hp=e5af4dd4cd4304b3f64fe33cba2fbbd1cececf9e;hpb=7dc335c17ae313c006e2283a35ca214b213ffcd9;p=topbloke-formulae.git diff --git a/create-tip.tex b/create-tip.tex index e5af4dd..3e88760 100644 --- a/create-tip.tex +++ b/create-tip.tex @@ -1,11 +1,11 @@ \section{Create Tip} Given a Topbloke base $B$ for a patch $\pq$, -create a tip branch initial commit B. +create a tip branch initial commit $C$. \gathbegin C \hasparents \{ B \} \gathnext - \patchof{B} = \pqy + \patchof{C} = \pqy \gathnext D \isin C \equiv D \isin B \lor D = C \end{gather} @@ -57,7 +57,9 @@ $$ \subsubsection{For $\p = \pq$:} By Base Acyclic, $D \not\isin B$. So $D \isin C \equiv D = C$. -By No Sneak, $D \not\le B$ so $D \le C \equiv D = C$. Thus $C \haspatch \pq$. +By No Sneak, $D \not\le B$ so $D \le C \equiv D = C$. Thus $C \zhaspatch \pq$. +And we can set $F = C$ giving $F \in \pqy \land F \le C$ so $C +\haspatch \pq$. \subsubsection{For $\p \neq \pq$:}