merge: rename Foreign Merge (was Foreign Merges)

[topbloke-formulae.git] / strategy.tex

diff --git a/strategy.tex b/strategy.tex
index e2017c34c3fcd516d308438ab5c6f33f3b577583..e12ff66afbbdc142eb4001b2778387735bfccd0f 100644 (file)
--- a/strategy.tex
+++ b/strategy.tex
@@ -84,6 +84,12 @@ all of its dependencies will be updated.
 \item[ $h : \pc^{+/-} \mapsto \set H^{\pc^{+/-}}$ ]
 Function for getting the existing heads $\set H$ of the branch $\pc^{+/-}$.
 
+\item[ $w : \pc^{+/-} \mapsto \set W_0^{\pc^{+/-}}$ ]
+
+Function for getting the existing local head of the branch
+$\pc^{+/-}$.  I.e., the current value of the branch ref for $\pc^{+/-}$.
+$W_0^{\pc^{+/-}} \in \set H$.
+
 \item[ $g : \pc, \Gamma \mapsto \Gamma'$ ]
 Function to allow explicit adjustment of the direct dependencies
 of $\pc$.  It is provided with a putative set of direct dependencies
@@ -124,8 +130,9 @@ $\allreach$ varies over time as we generate more commits.  Each
 commit we generate will have only reachable commits as ancestors, so
 generating a new commit (only) adds that new commit to $\allreach$.
 
-\item[ $\allreachof{\py}$ ]
-The set of reachable commits at the point where we have just generated
-$\tippy$, i.e. just after $\alg{Merge-Tip}(\p)$.
+\item[ $\allreachof{\pn}$, $\allreachof{\py}$ ]
+The sets of reachable commits at the point where we have just generated
+$\tippn$ or $\tippy$, i.e. just after $\alg{Merge-Base}(\p)$ or
+$\alg{Recreate-Base}(\p)$, or $\alg{Merge-Tip}(\p)$, respectively.
 
 \end{basedescript}