wip traversal

[topbloke-formulae.git] / strategy.tex

diff --git a/strategy.tex b/strategy.tex
index 1e8ee0156f5846bec3d54e4852396c703c432564..bfd392224d6e5c854573b4988f4314fd66d40530 100644 (file)
--- a/strategy.tex
+++ b/strategy.tex
@@ -74,7 +74,7 @@ All the input commits to the update algorithm.  (See below.)
 The topmost patch which we are trying to update.  This and
 all of its dependencies will be updated.
 
 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.
 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.


@@ -104,8 +104,8 @@ during the update algorithm).
 
 \item[ $\tipcn, \tipcy$ ]
 The new tips of the git branches $\pcn$ and $\pcy$, containing
 
 \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}
 
 
 \end{basedescript}