From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 5 Mar 2012 19:16:05 +0000 (+0000)
Subject: wip anticommit; use \merge
X-Git-Tag: f0.2~153
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=1511c5c4eb6b930fb76c06b88c4c5f57756e78eb

wip anticommit; use \merge
---

diff --git a/article.tex b/article.tex
index 06b7612..f712ba6 100644
--- a/article.tex
+++ b/article.tex
@@ -363,17 +363,24 @@ Used for removing a branch dependency.
 \gathnext
  \patchof{C} = \patchof{L}
 \gathnext
- D \isin C \equiv
-   \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}
+ \merge{C}{L}{R^+}{R^-}
 \end{gather}
 
-xxx want to prove $D \isin C \equiv D \not\in pry \land D \isin L$.
+\subsection{Conditions}
+
+\[ \eqn{ Unique Tip }{
+ \pendsof{L}{\pry} = \{ R^+ \}
+}\]
+\[ \eqn{ Correct Base }{
+ \baseof{R^+} = R^-
+}\]
+\[ \eqn{ Currently Included }{
+ L \haspatch \pry
+}\]
+
+
+
+xxx want to prove $D \isin C \equiv D \not\in \pry \land D \isin L$.
 
 \section{Merge}
 
@@ -383,12 +390,7 @@ Merge commits $L$ and $R$ using merge base $M$ ($M < L, M < 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}
+ \merge{C}{L}{M}{R}
 \end{gather}
 
 \subsection{Conditions}