From 389264b61a113301ca87b6d17fe19dafdd50e9e9 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 14 Jul 2012 02:53:52 +0100 Subject: [PATCH 1/1] strategy: sort out some headings --- traversal.tex | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/traversal.tex b/traversal.tex index 93a3eb8..407c60d 100644 --- a/traversal.tex +++ b/traversal.tex @@ -1,13 +1,15 @@ -\section{Traversal phase --- algorithm} +\section{Traversal phase} -(In general, unless stated otherwise below, when we generate a new +In general, unless stated otherwise below, when we generate a new commit $C$ using one of the commit kind recipies, we update $W \assign C$. In any such case where we say we're going to Merge with $L = W$, if $R \ge W$ we do not Merge but instead simply set $W \assign R$. For each commit generation operation called for by the traversal -algorithms, we prove that the commit generation preconditions are met.) +algorithms, we prove that the commit generation preconditions are met. + +\subsection{Algorithm} For each patch $\pc \in \allpatches$ in topological order by $\hasdep$, lowest first: @@ -25,9 +27,10 @@ lowest first: \end{enumerate} +\subsection{Results} + After processing each $\pc$ we will have created $\tipcn$ and $\tipcy$ such that: - \statement{Correct Base}{ \baseof{\tipcy} = \tipcn } -- 2.30.2