strategy: wip

diff --git a/article.tex b/article.tex
index 54de0cecf8d9b288d4149c285d3fe1b94379a162..add5d5244624555beae1b4c507f3199f40b59772 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -158,7 +158,7 @@
 \input{anticommit.tex}
 \input{merge.tex}
 
-\chapter{Merge strategy}
+\chapter{Update strategy}
 
 \input{strategy.tex}
 

diff --git a/strategy.tex b/strategy.tex
index 3f54451dcd698714e0326797f62f1483bbc86ab7..eff0adfd8ca423dd3668b48c386189f352d086cc 100644 (file)
--- a/strategy.tex
+++ b/strategy.tex
@@ -1,7 +1,8 @@
-When we are trying to do a merge of some kind, in general,
-we want to merge some source commits $S_0 \ldots S_n$.
-We'll write $S_0 = L$.  We require that $L$ is the current git ref
-for $\patchof{L}$.
+When we are trying to do an update of some kind, in general,
+for each patch $\pc$
+we want to merge some source commits $S \in \set S_{\pc}$.
+We require $\patchof{S} = \pc$,
+and $\tipcc \in \set S_{\pc}$.
 
 \stdsection{Notation}
 
@@ -23,9 +24,9 @@ set $\pq$.
 Acyclic; the completion of $\hasdirdep$ into a
 partial order.
 
-\item[ $\set E_{\pc}$ ]
-$ \bigcup_i \pendsof{S_i}{\pc} $.
-All the ends of $\pc$ in the sources.
+%\item[ $\set E_{\pc}$ ]
+%$ \bigcup_i \pendsof{S_{\pc,i}}{\pc} $.
+%All the ends of $\pc$ in the sources.
 
 \item[ $ \tipzc, \tipcc, \tipuc, \tipfc $ ]
 The git ref for the Topbloke commit set $\pc$: respectively,
@@ -35,10 +36,11 @@ the original, current, updated, and final values.
 
 \section{Planning phase}
 
-The planning phase computes: 
+The results of the planning phase consist of: 
 \begin{itemize*}
 \item{ The relation $\hasdirdep$ and hence the partial order $\hasdep$. }
-\item{ For each commit set $\pc$, the order in which to merge
+\item{ For each commit set $\pc$, a confirmed set of sources $\set S_{\pc}$. }
+\item{ For each commit set $\pc$, the order in which to merge the sources
         $E_{\pc,j} \in \set E_{\pc}$. }
 \item{ For each $E_{\pc,j}$ an intended merge base $M_{\pc,j}$. }
 \end{itemize*}