fix title etc. in merge use of no replay

[topbloke-formulae.git] / article.tex

diff --git a/article.tex b/article.tex
index 1f7a59bd4018b2ed9aba33b8a46989dd24cb33c4..89d23fe179d9bfc53524f3cfe65fb20d4425f51e 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -389,7 +389,7 @@ $D \isin C \equiv D \isin A \equiv D \le A \equiv D \le C$.  $\qed$
 \section{Anticommit}
 
 Given $L, R^+, R^-$ where
-$\patchof{R^+} = \pry, \patchof{R^-} = \prn$.  
+$R^+ \in \pry, R^- = \baseof{R^+}$.  
 Construct $C$ which has $\pr$ removed.
 Used for removing a branch dependency.
 \gathbegin
@@ -405,16 +405,25 @@ Used for removing a branch dependency.
 \[ \eqn{ Unique Tip }{
  \pendsof{L}{\pry} = \{ R^+ \}
 }\]
-\[ \eqn{ Correct Base }{
- \baseof{R^+} = R^-
-}\]
 \[ \eqn{ Currently Included }{
  L \haspatch \pry
 }\]
 
+\subsection{Desired Contents}
+
+xxx need to prove $D \isin C \equiv D \not\in \pry \land D \isin L$.
+
+\subsection{No Replay}
+
+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$ and No Replay for
+Merge Results applies. $\qed$
+
+\subsection{Unique Base}
 
+Need to consider only $C \in \py$, ie $L \in \py$.
 
-xxx want to prove $D \isin C \equiv D \not\in \pry \land D \isin L$.
+xxx tbd
 
 \section{Merge}
 
@@ -440,9 +449,9 @@ Merge commits $L$ and $R$ using merge base $M$ ($M < L, M < R$):
    \end{cases}
 }\]
 
-\subsection{Merge Results}
+\subsection{No Replay}
 
-As above.
+See No Replay for Merge Results.
 
 \subsection{Unique Base}