strategy: wip proofs

diff --git a/trav-alg.tex b/trav-alg.tex
index 37d91941ef952d2b9ad6550a25e19ddb58421b71..4b6796a3e97110b88072f0206949eaae253f6484 100644 (file)
--- a/trav-alg.tex
+++ b/trav-alg.tex
@@ -23,13 +23,18 @@ lowest first:
 
 \end{enumerate}
 
-After processing each $\pc$ we will have created:
-
-\begin{itemize}
-
-\item $\tipcn$ and $\tipcy$ such that $\baseof{\tipcy} = \tipcn$.
-
-\end{itemize}
+After processing each $\pc$ we will have created $\tipcn$ and $\tipcy$
+such that:
+
+\statement{Correct Base}{
+  \baseof{\tipcy} = \tipcn
+}
+\statement{Base Ends Supreme}{
+  \tipcn \ge \pendsof{\allsrcs}{\pcn}
+}
+\statement{Tip Ends Supreme}{
+  \tipcy \ge \pendsof{\allsrcs}{\pcy}
+}
 
 \subsection{$\alg{Merge-Base}(\pc)$}
 

diff --git a/trav-proofs.tex b/trav-proofs.tex
index 14f6cd8942edbc6af512430fa6be7042948d2218..67e1b113b696e79de2680381c0df917654b7488a 100644 (file)
--- a/trav-proofs.tex
+++ b/trav-proofs.tex
@@ -5,3 +5,23 @@ that the commit generation preconditions are met.
 
 \subsection{Tip Base Merge}
 
+$L = W$, $R = \tipcn$.
+
+TODO TBD
+
+Afterwards, $\baseof{W} = \tipcn$.
+
+\subsection{Tip Source Merge}
+
+In fact, we do this backwards: $L = S$, $R = W$.  Since $S \in \pcy$,
+the resulting $C \in \pcy$ and the remaining properties of the Merge
+commit construction are symmetrical in $L$ and $R$ so this is fine.
+
+By the results of Tip Base Merge, $\baseof{W} = \tipcn$.
+
+By Base Ends Supreme, $\tipcn \ge \baseof{S}$ i.e.
+$\baseof{R} \ge \baseof{L}$.
+
+Either $\baseof{L} = \baseof{M}$, or we must choose a different $M$ in
+which case $M = \baseof{S}$ will suffice.
+