From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 2 Mar 2012 16:34:20 +0000 (+0000)
Subject: wip merge
X-Git-Tag: f0.2~174
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=1f1f6ab8fb22b2d8199b826de823b0167accdbbe

wip merge
---

diff --git a/article.tex b/article.tex
index d85a022..1f3d164 100644
--- a/article.tex
+++ b/article.tex
@@ -334,15 +334,22 @@ Merge commits $L$ and $R$ using merge base $M$ ($M < L, M < R$):
 
 \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]
+ L \in \py \implies
+   \begin{cases}
+      R \in \py : & \baseof{R} \ge \baseof{L}
+              \land [\baseof{L} = M \lor \baseof{L} = \baseof{M}] \\
+      R \in \pn : & R \ge \baseof{L}
+              \land M = \baseof{L} \\
+      \text{otherwise} : & \false
+   \end{cases}
 }\]
 
+\subsection{No Replay}
+
+\subsubsection{For $D=C$:} $D \isin C, D \le C$, trivial.
+
+\subsubsection{For $D \isin L \land D \isin R$:}
+$D \isin C$.  And $D \isin L
+
 \end{document}