From 83215439d0ccac0b21762b7ea0138ea32f2263fb Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 10 Aug 2013 18:29:12 +0100 Subject: [PATCH] strategy: define O^P^- --- article.tex | 1 + strategy.tex | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/article.tex b/article.tex index b37f9a5..45510aa 100644 --- a/article.tex +++ b/article.tex @@ -143,6 +143,7 @@ \newcommand{\tipdn}{ \tipa \pdn } \newcommand{\tipdy}{ \tipa \pdy } +\newcommand{\tippn}{ \tipa \pn } \newcommand{\tippy}{ \tipa \py } %\newcommand{\bigforall}{\mathop{\hbox{\huge$\forall$}}} diff --git a/strategy.tex b/strategy.tex index 2f676bb..e12ff66 100644 --- a/strategy.tex +++ b/strategy.tex @@ -130,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} -- 2.30.2