From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 2 Mar 2012 16:24:58 +0000 (+0000)
Subject: wip merge before rejoin tip merge condition
X-Git-Tag: f0.2~175
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=400772c417bd54383994df5a227df88adc769171;hp=3d1111b8b0f9f80fab557ecd0e9faf8aab04f6a9

wip merge before rejoin tip merge condition
---

diff --git a/article.tex b/article.tex
index 32f7920..d85a022 100644
--- a/article.tex
+++ b/article.tex
@@ -318,7 +318,7 @@ $D \isin C \equiv D \isin A \equiv D \le A \equiv D \le C$.  $\qed$
 
 \section{Merge}
 
-Given commits $L$, $R$, $M$:
+Merge commits $L$ and $R$ using merge base $M$ ($M < L, M < R$):
 \gathbegin
  C \hasparents \{ L, R \}
 \gathnext
@@ -332,9 +332,17 @@ Given commits $L$, $R$, $M$:
   \end{cases}
 \end{gather}
 
-Conditions
-\gathbegin
- M < L, M < R
-\end{gather}
+\subsection{Conditions}
+
+\[ \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}