strategy: traversal, Tip-Merge, from base, Foreign Merges

[topbloke-formulae.git] / traversal.tex

diff --git a/traversal.tex b/traversal.tex
index 55a4900f790d4a08aed2ed4ae8272cdb9f0f9354..ab1e6d4ade011651642cbc61bf8ac5ab3e3a4aae 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}$.
-   Well $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