strategy: add a TODO since Base Ends Supreme is not defined anywhere

[topbloke-formulae.git] / traversal.tex

diff --git a/traversal.tex b/traversal.tex
index a241644e3e3ff1c2711904fc73b69c19d944793d..61d904e13375efbe111a27300a3f7bac430cc16b 100644 (file)
--- a/traversal.tex
+++ b/traversal.tex
@@ -221,14 +221,16 @@ R = \tipcn$ and $M = \baseof{W}$.
   \condproof{Ingredients}{
    $M \le L$ is trivial.  For $M \le R$ we want
    $\tipcn \ge \baseof{W}$.
-
-   Now $\pendsof{\allreach}{\tipcy} =
-   \pendsof{\allreachof{\pcn}}{\tipcy}$
-   since we have created no commits $\in \pcn$ since
-   calculating $\tipcy$.
-
-   By Base Covers Reachable, $\tipcn \ge $
+   Well $W \in \set S^{\pcy}$ so $W \in \allreachof{\pcn}$
+   and $W \in \pcy$.  So $W \in \pendsof{\allreachof{\pcn}}{\pcy}$
+   so Base Covers Reachable indeed
+   $\tipcn \ge \baseof{W}$.
+  }
+  \condproof{Tip Merge}{ Trivial. }
+  \condproof{Merge Acyclic}{
+   By Base Acyclic, $\tipcn \nothaspatch \p$.
   }
+  \condproof{Foreign Merges}{ Not applicable. }
 
   TODO TBD
 
@@ -246,7 +248,7 @@ $\alg{Merge}$ with $L = W, \; R = S$ and any suitable $M$.
 
   By the results of Tip Base Merge, $\baseof{W} = \tipcn$.
 
-  By Base Ends Supreme, $\tipcn \ge \baseof{S}$ i.e.
+  By Base Ends Supreme TODO CHECK THIS, $\tipcn \ge \baseof{S}$ i.e.
   $\baseof{R} \ge \baseof{L}$.
 
   Either $\baseof{L} = \baseof{M}$, or we must choose a different $M$ in