From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 7 Jul 2012 18:39:59 +0000 (+0100)
Subject: wip traversal, diverting to do Recreate-Base first
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=e53011eb40f80fa71b1c37be544d6b8a2fdf58ab;p=topbloke-formulae.git

wip traversal, diverting to do Recreate-Base first
---

diff --git a/trav-alg.tex b/trav-alg.tex
index 9e5197e..abe2441 100644
--- a/trav-alg.tex
+++ b/trav-alg.tex
@@ -81,6 +81,8 @@ That is, use $\alg{Merge}$ with $L = W,\; R = S,\; M = M^{\pcn}_i$.
 
 Execute $\alg{Fixup-Base}(W,\pc)$.
 
+TODO define Fixup-Base
+
 \subsubsection{Result}
 
 If all of that was successful, let $\tipcn = W$.
diff --git a/trav-proofs.tex b/trav-proofs.tex
index 415c939..b451a61 100644
--- a/trav-proofs.tex
+++ b/trav-proofs.tex
@@ -3,12 +3,16 @@
 For each operation called for by the traversal algorithms, we prove
 that the commit generation preconditions are met.
 
+WIP WHAT ABOUT PROVING ALL THE TRAVERSAL RESULTS
+
 \subsection{Base Dependency Merge, Base Sibling Merge}
 
 We do not prove that the preconditions are met.  Instead, we check
 them at runtime.  If they turn out not to be met, we abandon
 \alg{Merge-Base} and resort to \alg{Recreate-Base}.
 
+TODO COMPLETE MERGE-BASE STUFF
+
 WIP WHAT ABOUT PROVING ALL THE TRAVERSAL RESULTS
 
 \subsection{Tip Base Merge}