strategy: wip

diff --git a/strategy.tex b/strategy.tex
index ca31c32c2443c357f31d58974462003120522c38..3760941afd1c8b4707132d6b97cbdf9d6a155d61 100644 (file)
--- a/strategy.tex
+++ b/strategy.tex
@@ -8,6 +8,7 @@ We start with some commits $S_0 \ldots S_n$
 Invoke Plan $\patchof \pl$ where the algorithm Plan $\pc$ is as
 follows:
 
 Invoke Plan $\patchof \pl$ where the algorithm Plan $\pc$ is as
 follows:
 

+

 Notation:
 
  $\pc \succ_1 \{ \p, \pq \ldots \}$ 
 Notation:
 
  $\pc \succ_1 \{ \p, \pq \ldots \}$ 


@@ -18,6 +19,7 @@ Notation:
 
 $\py \succ \pq$ 
 
 
 $\py \succ \pq$ 
 

+

 We intend to merge all $\set E_{\pc} = \{ E_{\pc,j \ldots} \}$
 and all the direct contributors of $\pc$ (as determined below)
 into the existing git ref for $\pc$, to make $T_{\pc}$.
 We intend to merge all $\set E_{\pc} = \{ E_{\pc,j \ldots} \}$
 and all the direct contributors of $\pc$ (as determined below)
 into the existing git ref for $\pc$, to make $T_{\pc}$.


@@ -39,7 +41,7 @@ Initially let $T_{\pc,0}$ be the git ref for $\pcn$.  And let
 $\set D_0 = \depsreqof{T_{\pc,0}}$.
 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}$.
 $\set D_0 = \depsreqof{T_{\pc,0}}$.
 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 $D_j$ as the 3-way merge of the sets $D_{j-1}$ and
+Calculate $\set D_j$ as the 3-way merge of the sets $\set D_{j-1}$ and

 $\depsreqof{E_j}$ using as a base $\depsreqof{M_j}$.  This will
 generate $D_m$ as the putative direct contributors for $\pcn$.
 
 $\depsreqof{E_j}$ using as a base $\depsreqof{M_j}$.  This will
 generate $D_m$ as the putative direct contributors for $\pcn$.