wip merge before rejoin tip merge condition

[topbloke-formulae.git] / article.tex

diff --git a/article.tex b/article.tex
index f40f6a2c508b4877d8fe619685ff8f810f20a63a..d85a022ff8fb8388f380325f4ffd4ed9e4330d5d 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -66,6 +66,9 @@
 \newcommand{\gathbegin}{\begin{gather} \tag*{}}
 \newcommand{\gathnext}{\\ \tag*{}}
 
+\newcommand{\true}{t}
+\newcommand{\false}{f}
+
 \begin{document}
 
 \section{Notation}
@@ -286,7 +289,7 @@ Ancestors of $C$:
 $ D \le C $.
 
 Contents of $C$:
-$ D \isin C \equiv \ldots \lor t \text{ so } D \haspatch C $.
+$ D \isin C \equiv \ldots \lor \true \text{ so } D \haspatch C $.
 
 \subsubsection{For $A \haspatch P, D \neq C$:}
 Ancestors: $ D \le C \equiv D \le A $.
@@ -313,16 +316,33 @@ $\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{Test more symbols}
-
-$ C \haspatch \p $
-
-$ C \nothaspatch \p $
+\section{Merge}
 
-$ \p \patchisin C $
+Merge commits $L$ and $R$ using merge base $M$ ($M < L, M < R$):
+\gathbegin
+ C \hasparents \{ L, R \}
+\gathnext
+ \patchof{C} = \patchof{L}
+\gathnext
+ D \isin C \equiv
+  \begin{cases}
+    (D \isin L \land D \isin R) \lor D = C : & \true \\
+    (D \not\isin L \land D \not\isin R) \land D \neq C : & \false \\
+    \text{otherwise} : & D \not\isin M
+  \end{cases}
+\end{gather}
 
-$ \p \notpatchisin C $
+\subsection{Conditions}
 
-$ \{ B \} \areparents C $
+\[ \eqn{ Merges Exhaustive }{
+ L \in \py => \Bigl[ R \in \py \lor R \in \pn \Bigr]
+}\]
+\[ \eqn{ Tip Merge }{
+ L \in \py \land R \in \py \implies \Bigl[ \text{TBD} \Bigr]
+}\]
+\[ \eqn{ Base Merge }{
+ L \in \py \land R \in \pn \implies \Bigl[ R \ge \baseof{L} \land M =
+   \baseof{L} \Bigr]
+}\]
 
 \end{document}