merge: fix dependency reinsertion blurb to mention the need for the base to be merged...

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

diff --git a/create-tip.tex b/create-tip.tex
index e5af4dd4cd4304b3f64fe33cba2fbbd1cececf9e..382cd0c69a516e431b51289e421398ac3cb9a33e 100644 (file)
--- 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$:}
 
@@ -66,6 +68,10 @@ and $D \le C \equiv D \le B$.
 
 $\qed$
 
+\subsection{Unique Tips:}
+
+Single Parent Unique Tips applies.  $\qed$
+
 \subsection{Foreign Inclusion}
 
 Simple Foreign Inclusion applies.  $\qed$