X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=blobdiff_plain;f=article.tex;h=008229a17c249447403c8039618b8914ffc6f224;hp=e6447d92380b854b40c0c1bf9d61825564f79a4d;hb=0fa67d5fbecdec4faf97bbfef6ec0ba27fa91548;hpb=1dba870613dc3668dbbcb5cf5afd61f9cd310a1d

diff --git a/article.tex b/article.tex
index e6447d9..008229a 100644
--- a/article.tex
+++ b/article.tex
@@ -399,7 +399,9 @@ Need to consider only $A, C \in \pn$.
 For $D = C$: $D \in \pn$ so $D \not\in \py$. OK.
 
 For $D \neq C$: $D \isin C \equiv D \isin A$, so by Base Acyclic for
-$A$, $D \isin C \implies D \not\in \py$. $\qed$
+$A$, $D \isin C \implies D \not\in \py$.
+
+$\qed$
 
 \subsection{Coherence and patch inclusion}
 
@@ -438,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
@@ -454,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
 }\]
@@ -468,6 +480,7 @@ Used for removing a branch dependency.
 
 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.)
@@ -545,6 +558,8 @@ So $L \nothaspatch \p \implies C \nothaspatch \p$.
 Whereas if $L \haspatch \p$, $D \isin L \equiv D \le L$.
 so $L \haspatch \p \implies C \haspatch \p$.
 
+$\qed$
+
 \section{Foreign Inclusion}
 
 Consider some $D$ s.t. $\patchof{D} = \bot$.  $D \neq C$.
@@ -552,7 +567,9 @@ So by Desired Contents $D \isin C \equiv D \isin L$.
 By Foreign Inclusion of $D$ in $L$, $D \isin L \equiv D \le L$.
 
 And $D \le C \equiv D \le L$.
-Thus $D \isin C \equiv D \le C$.  $\qed$
+Thus $D \isin C \equiv D \le C$.
+
+$\qed$
 
 \section{Merge}
 
@@ -730,7 +747,9 @@ $C \in \pn$ when $L \in \pn$ so by Merge Acyclic, $R \nothaspatch \p$.
 Consider some $D \in \py$.
 
 By Base Acyclic of $L$, $D \not\isin L$.  By the above, $D \not\isin
-R$.  And $D \neq C$.  So $D \not\isin C$.  $\qed$
+R$.  And $D \neq C$.  So $D \not\isin C$.
+
+$\qed$
 
 \subsection{Tip Contents}