From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 27 May 2012 17:24:09 +0000 (+0100)
Subject: strategy: new, wip, found
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=29f2e80b8172eefb43a4dce9fad4070609e22dcf

strategy: new, wip, found
---

diff --git a/strategy.tex b/strategy.tex
index d9a2545..3412853 100644
--- a/strategy.tex
+++ b/strategy.tex
@@ -43,7 +43,7 @@ partial order.
 
 \item[ $\pendsof{\set J}{\p}$ ]
 Convenience notation for
-the maximal elements of $\bigcup_{J \in \set J} \pendsof{J}{\p}$
+the $\le$-maximal elements of $\bigcup_{J \in \set J} \pendsof{J}{\p}$
 (where $\set J$ is some set of commits).
 
 \item[ $\pendsof{\set X}{\p} \le T$ ]
@@ -127,7 +127,7 @@ is a collection of heads to be merged into $W$.)
 \item For each $S_i$ in turn, choose a corresponding $M_i$
 such that $$
    M_i \le S_i \land \left[
-   M_i \le W \lor \bigexists_{S_i, j<i} M_i \le s_i
+   M_i \le W \lor \bigexists_{S_i, j<i} M_i \le S_i
    \right]
 $$
 
@@ -176,6 +176,10 @@ the ordered set of base branch sources $\set S_{\pcn} = \set S,
 S_{\pcn,i} = S_i$
 and corresponding merge bases $M_{\pcn,i} = M_i$.
 
+\section{Traversal phase}
+
+
+
 
 
 \section{Planning phase}