From: Ian Jackson Date: Mon, 30 Apr 2012 10:30:46 +0000 (+0100) Subject: strategy: wip X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=946afb6b549b0f3a828f6d4bcf9362d803de6434 strategy: wip --- diff --git a/strategy.tex b/strategy.tex index 2690712..3f54451 100644 --- a/strategy.tex +++ b/strategy.tex @@ -37,7 +37,7 @@ the original, current, updated, and final values. The planning phase computes: \begin{itemize*} -\item{ The relation $\hasdirdep$ and hence the ordering $\hasdep$. } +\item{ The relation $\hasdirdep$ and hence the partial order $\hasdep$. } \item{ For each commit set $\pc$, the order in which to merge $E_{\pc,j} \in \set E_{\pc}$. } \item{ For each $E_{\pc,j}$ an intended merge base $M_{\pc,j}$. }