X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=blobdiff_plain;f=strategy.tex;h=e0b126657816909da6179b1a86cb118cb1c9c63f;hp=d170919d3c160e4d1842d324b61a1fba79a8bfa4;hb=51dabd467724221f7dc2c442ef1e46a330ac7c5c;hpb=727ac7504bdc6df349acce9934892cd372ffe086

diff --git a/strategy.tex b/strategy.tex
index d170919..e0b1266 100644
--- a/strategy.tex
+++ b/strategy.tex
@@ -27,7 +27,7 @@ partial order.
 $ \bigcup_i \pendsof{S_i}{\pc} $.
 All the ends of $\pc$ in the sources.
 
-\item[ $ \grefzc, \grefcc, \grefuc, \greffc $ ]
+\item[ $ \tipzc, \tipcc, \tipuc, \tipfc $ ]
 The git ref for the Topbloke commit set $\pc$: respectively,
 the original, current, updated, and final values.
 
@@ -49,7 +49,7 @@ processing at each step $\pc$.
 At each recursive step 
 we make a plan to merge all $\set E_{\pc} = \{ E_{\pc,j \ldots} \}$
 and all the direct contributors of $\pc$ (as determined below)
-into $\grefzc$, to make $\greffc$.
+into $\tipzc$, to make $\tipfc$.
 
 We start with $\pc = \pl$ where $\pl = \patchof{L}$.
 
@@ -67,7 +67,7 @@ For brevity we will write $E_j$ for $E_{\pc,j}$.
 Remove from that set (and ordering) any $E_j$ which
 are $\le$ and $\neq$ some other $E_k$.
 
-Initially let $\set D_0 = \depsreqof{\grefzc}$.
+Initially let $\set D_0 = \depsreqof{\tipzc}$.
 For each $E_j$ starting with $j=1$ choose a corresponding intended
 merge base $M_j$ such that $M_j \le E_j \land M_j \le T_{\pc,j-1}$.
 Calculate $\set D_j$ as the 3-way merge of the sets $\set D_{j-1}$ and
@@ -99,35 +99,50 @@ for $\pc' = \p$.
 \section{Execution phase}
 
 We process commit sets from the bottom up according to the relation
-$\hasdep$.  For each commit set $\pc$ we construct $\greffc$ from
-$\grefzc$, as planned.  By construction, $\hasdep$ has $\patchof{L}$
+$\hasdep$.  For each commit set $\pc$ we construct $\tipfc$ from
+$\tipzc$, as planned.  By construction, $\hasdep$ has $\patchof{L}$
 as its maximum, so this operation will finish by updating
-$\greffa{\patchof{L}}$.
+$\tipfa{\patchof{L}}$.
 
 After we are done, the result has the following properties:
-\[ \eqn{Best Tip}{
-  \bigforall_{E_i \in \set E_{\pc}} \greffc \ge E_i
+\[ \eqn{Tip Inputs}{
+  \bigforall_{E_i \in \set E_{\pc}} \tipfc \ge E_i
+}\]
+\[ \eqn{Tip Dependencies}{
+  \bigforall_{\pc \hasdep \p} \tipfc \ge \tipfa \p
 }\]
 \[ \eqn{Perfect Contents}{
-  \greffc \haspatch \p \equiv \pc \hasdep \py
+  \tipfc \haspatch \p \equiv \pc \hasdep \py
 }\]
 
-For brevity we will write $\grefu$ for $\grefuc$, etc.  We will start
-out with $\grefc = \grefz$, and at each step of the way construct some
-$\grefu$ from $\grefc$.  The final $\grefu$ becomes $\greff$.
+For brevity we will sometimes write $\tipu$ for $\tipuc$, etc.  We will start
+out with $\tipc = \tipz$, and at each step of the way construct some
+$\tipu$ from $\tipc$.  The final $\tipu$ becomes $\tipf$.
 
 \subsection{Preparation}
 
-Firstly, we will check each $E_i$ for being $\ge \grefc$.  If
+Firstly, we will check each $E_i$ for being $\ge \tipc$.  If
 it is, are we fast forward to $E_i$
---- formally, $\grefu = \text{max}(\grefc, E_i)$ ---
+--- formally, $\tipu = \text{max}(\tipc, E_i)$ ---
 and drop $E_i$ from the planned ordering.
 
+Then we will merge the direct contributors and the sources' ends.
+
+This generates more commits $\tipuc \in \pc$, but none in any other
+commit set.  We maintain XXX FIXME IS THIS THE BEST THING?
+$$
+ \bigforall_{\p \isdep \pc}
+ \pancsof{\tipcc}{\p} \subset \left[
+   \tipfa \p \cup
+   \bigcup_{E \in \set E_{\pc}} \pancsof{E}{\p}
+  \right]
+$$
+
 \subsection{Merge Contributors for $\pcy$}
 
-Merge $\pcn$ into $\grefc$.  That is, merge with
-$L = \grefc, R = \greffa{\pcn}, M = \baseof{\grefc}$.
-to construct $\grefu$.
+Merge $\pcn$ into $\tipc$.  That is, merge with
+$L = \tipc, R = \tipfa{\pcn}, M = \baseof{\tipc}$.
+to construct $\tipu$.
 
 Merge conditions: Ingredients satisfied by construction.
 Tip Merge satisfied by construction.  Merge Acyclic follows
@@ -140,8 +155,18 @@ worry about $X = R, Y = L$; ie $L \haspatch \p$,
 $M = \baseof{L} \haspatch \p$.
 By Tip Contents for $L$, $D \le L \equiv D \le M$.  $\qed$
 
-OK
-UP TO HERE
+WIP UP TO HERE
+
+Addition Merge Ends: If $\py \isdep \pcn$, we have already
+done the execution phase for $\pcn$ and $\py$.  By
+Perfect Contents for $\pcn$, $\tipfa \pcn \haspatch \p$ i.e.
+$R \haspatch \p$.  So we only need to worry about $Y = R = \tipfa \pcn$.
+By Tip Dependencies $\tipfa \pcn \ge \tipfa \py$.
+And by Tip Inputs $\tipfa \py \ge $
+
+
+computed $\tipfa \py$, and by Perfect Contents for $\py$
+
 
 with $M=M_j, L=T_{\pc,j-1}, R=E_j$,
 and calculate what the resulting desired direct dependencies file