X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=article.tex;h=090ae13120114180e1a0d49e141f518d5cf15f1a;hb=a95c3485b6141faa1833701180536b9ed138c89a;hp=fda5026a8de1e76d083b9482b537e3d81915147a;hpb=06ac9200d087b074fe60a46fbe186dab4bf653c9;p=topbloke-formulae.git

diff --git a/article.tex b/article.tex
index fda5026..090ae13 100644
--- a/article.tex
+++ b/article.tex
@@ -440,10 +440,17 @@ $\qed$
 If $D = C$, trivial.  For $D \neq C$:
 $D \isin C \equiv D \isin A \equiv D \le A \equiv D \le C$.  $\qed$
 
+\section{Create Base}
+
+xxx tbd
+
+\section{Create Tip}
+
+xxx tbd\
+
 \section{Anticommit}
 
-Given $L, R^+, R^-$ where
-$R^+ \in \pry, R^- = \baseof{R^+}$.  
+Given $L$ and $\pr$ as represented by $R^+, R^-$.
 Construct $C$ which has $\pr$ removed.
 Used for removing a branch dependency.
 \gathbegin
@@ -456,6 +463,9 @@ Used for removing a branch dependency.
 
 \subsection{Conditions}
 
+\[ \eqn{ Ingredients }{
+R^+ \in \pry \land R^- = \baseof{R^+}
+}\]
 \[ \eqn{ Into Base }{
  L \in \pn
 }\]
@@ -472,8 +482,8 @@ By Unique Tip, $R^+ \le L$.  By definition of $\base$, $R^- \le R^+$
 so $R^- \le L$.  So $R^+ \le C$ and $R^- \le C$.
 $\qed$
 
-(Note that the merge base $R^+ \not\le R^-$, i.e. the merge base is
-later than one of the branches to be merged.)
+(Note that $R^+ \not\le R^-$, i.e. the merge base
+is a descendant, not an ancestor, of the 2nd parent.)
 
 \subsection{No Replay}