From 23129e4ede4f93a172b3eab8e51144f2488af972 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 27 Apr 2012 11:19:51 +0100 Subject: [PATCH] strategy: use \chapter --- article.tex | 5 +++++ notation.tex | 2 +- strategy.tex | 8 +++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/article.tex b/article.tex index 740a2bc..198ced4 100644 --- a/article.tex +++ b/article.tex @@ -126,6 +126,8 @@ \begin{document} +\chapter{Data model} + \input{notation.tex} \input{invariants.tex} \input{lemmas.tex} @@ -136,6 +138,9 @@ \input{create-tip.tex} \input{anticommit.tex} \input{merge.tex} + +\chapter{Merge strategy} + \input{strategy.tex} \end{document} diff --git a/notation.tex b/notation.tex index 6eb2e80..bee8eff 100644 --- a/notation.tex +++ b/notation.tex @@ -1,4 +1,4 @@ -\section{Notation} +\stdsection{Notation} Throughout, any free variables are implicitly universally quantified at the outermost level. diff --git a/strategy.tex b/strategy.tex index 50efed7..4cd80db 100644 --- a/strategy.tex +++ b/strategy.tex @@ -1,11 +1,9 @@ -\section{Strategy} - When we are trying to do a merge of some kind, in general, we want to merge some source commits $S_0 \ldots S_n$. We'll write $S_0 = L$. We require that $L$ is the current git ref for $\patchof{L}$. -\subsection{Notation} +\stdsection{Notation} \begin{basedescript}{ \desclabelwidth{5em} @@ -31,7 +29,7 @@ All the ends of $\pc$ in the sources. \end{basedescript} -\subsection{Planning phase} +\section{Planning phase} We use a recursive planning algorith, recursing over Topbloke commit sets (ie, sets $\py$ or $\pn$). We'll call the commit set we're @@ -47,7 +45,7 @@ corresponding to the tip branches for the direct dependencies of $\pc$. The sole direct contributor of $\pcy$ is $\pcn$. -\subsubsection{Planning step for $\pc = \pcn$.} +\subsection{Planning step for $\pc = \pcn$.} Choose an (arbitrary, but ideally somehow optimal in a way not discussed here) ordering of $\set E_{\pc}$, $E_j$ (for -- 2.30.2