From 72b5b4dfa71909497490c3a09271a1adda1884c7 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 7 Jul 2012 19:38:59 +0100
Subject: [PATCH] wip traversal

---
 trav-alg.tex    | 5 ++++-
 trav-proofs.tex | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/trav-alg.tex b/trav-alg.tex
index 8cbaa9a..9e5197e 100644
--- a/trav-alg.tex
+++ b/trav-alg.tex
@@ -69,7 +69,7 @@ In some order, perhaps interleaving the two kinds of merge:
 \item For each $\hasdep$-maximal $\pd \isdirdep \pc$, find a merge base
 $M \le W,\; \le \tipdy$ and merge $\tipdy$ into $W$.
 That is, use $\alg{Merge}$ with $L = W,\; R = \tipdy$.
-(Dependency Merge.)
+(Base Dependency Merge.)
 
 \item For each $S \in S^{\pcn}_i$, merge it into $W$.
 That is, use $\alg{Merge}$ with $L = W,\; R = S,\; M = M^{\pcn}_i$.
@@ -81,6 +81,9 @@ That is, use $\alg{Merge}$ with $L = W,\; R = S,\; M = M^{\pcn}_i$.
 
 Execute $\alg{Fixup-Base}(W,\pc)$.
 
+\subsubsection{Result}
+
+If all of that was successful, let $\tipcn = W$.
 
 \subsection{$\alg{Recreate-Base}(\pc)$}
 
diff --git a/trav-proofs.tex b/trav-proofs.tex
index 67e1b11..415c939 100644
--- a/trav-proofs.tex
+++ b/trav-proofs.tex
@@ -3,6 +3,14 @@
 For each operation called for by the traversal algorithms, we prove
 that the commit generation preconditions are met.
 
+\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}.
+
+WIP WHAT ABOUT PROVING ALL THE TRAVERSAL RESULTS
+
 \subsection{Tip Base Merge}
 
 $L = W$, $R = \tipcn$.
-- 
2.30.2