notation: fixes from paper markup of 389264b

[topbloke-formulae.git] / strategy.tex

diff --git a/strategy.tex b/strategy.tex
index 833f5bdfe06fe6c2846815c66dcde91002d674be..a4716b313dd577c5e74c6e1a7afe4f39ba8be082 100644 (file)
--- a/strategy.tex
+++ b/strategy.tex
@@ -107,53 +107,20 @@ The new tips of the git branches $\pcn$ and $\pcy$, containing
 all the appropriate commits (and the appropriate 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}
-
-\stdsection{ WIP tip satisfaction, reachable commits }
-
-Set of all reachable commits, O.
+\item[ $\allreach$ ]
+The set of all reachable commits.

 
 A reachable commit is one we might refer to explicitly in any of these
 algorithms, and any ancestor of such a commit.  We explicitly
 
 A reachable commit is one we might refer to explicitly in any of these
 algorithms, and any ancestor of such a commit.  We explicitly

-enumerate all of the input commits (U).  And each commit we generate
-will be descended from zero or more of these.
-
-Naturally this set varies over time as we generate more commits.  We
-write O_pyn for the set of reachable commits at the point where we
-have just generated T_pyn.
-
-We preserve/ensure
-  Tip_Pyn >= pendsof( O_pyn, Pyn )
-(Tip_pyn is computed during traversal for the patch p)
-
-We ensure this property by:
-  - we do not generate any commits for pyn other than
-    during traversal for pyn
-  - so at the start of traversal pendsof ( O, pyn) = pendsof (U, pyn)
-  - the traversal steps will takes those pends
+enumerate all of the input commits ($\allsrcs$), so the reachable
+commits are originally the input commits and their ancestors.

 
 

-  - during traversal for the patch set pyn
-    pendsof 
+$\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$.

 
 

-  - arranging that during traversal for the patch set pyn
-     
-, we firstly
-    compute a tip_pyn which is >= pendsof(O) as follows:
-      there is a set of relevant ends
-              pendsof(U, 
-
-      we initially set T
-
-    by virtue of it being  >= pendsof(U) \cup
-    all lower tip_qyn
- - 
-
-We do this by:
- - firstly, Tip_pyn is only valid af
-  
-
-Set of all reachable commits in a particular patch set.
- This consists of
-  - input commits
-  - 
+\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)$.

 
 

+\end{basedescript}