wip traversal

[topbloke-formulae.git] / strategy.tex

diff --git a/strategy.tex b/strategy.tex
index bf136f69c912d185b9531089fafc2dd2922913c6..bfd392224d6e5c854573b4988f4314fd66d40530 100644 (file)
--- a/strategy.tex
+++ b/strategy.tex
@@ -50,6 +50,10 @@ the $\le$-maximal elements of $\bigcup_{J \in \set J} \pendsof{J}{\p}$
 Convenience notation for
 $\bigforall_{E \in \pendsof{\set X}{\p}} E \le T$
 
+\item[ $\allsrcs$ ]
+$\bigcup_{\p \in \allpatches} \set H^{\pn} \cup \set H^{\py}$.
+All the input commits to the update algorithm.  (See below.)
+
 %\item[ $\set E_{\pc}$ ]
 %$ \bigcup_i \pendsof{S_{\pc,i}}{\pc} $.
 %All the ends of $\pc$ in the sources.
@@ -70,7 +74,7 @@ $\bigforall_{E \in \pendsof{\set X}{\p}} E \le T$
 The topmost patch which we are trying to update.  This and
 all of its dependencies will be updated.
 
-\item[ $h : \pc^{+/-} \mapsto \set H_{\pc^{+/-}}$ ]
+\item[ $h : \pc^{+/-} \mapsto \set H^{\pc^{+/-}}$ ]
 Function for getting the existing heads $\set H$ of the branch $\pc^{+/-}$.
 These are the heads which will be merged and used in this update.
 This will include the current local and remote git refs, as desired.
@@ -100,8 +104,8 @@ during the update algorithm).
 
 \item[ $\tipcn, \tipcy$ ]
 The new tips of the git branches $\pcn$ and $\pcy$, containing
-all the correct commits (and the correct other patches), as
-generated by the Traversal phase of the update algorithm.
+all the appropriate commits (and the appropriate other patches),
+as generated by the Traversal phase of the update algorithm.
 
 \end{basedescript}