X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=article.tex;h=92092d285d92fc2e228e37e2839a15acf984d11a;hb=5c02a85042852a79c36cd67c1c0b6778ffd5eff1;hp=1e7adc26461f2083df2e4199726814428a396255;hpb=70d3742a65313c482c967727c9110ec5c4a59695;p=topbloke-formulae.git

diff --git a/article.tex b/article.tex
index 1e7adc2..92092d2 100644
--- a/article.tex
+++ b/article.tex
@@ -92,10 +92,15 @@
 \newcommand{\base}{{\mathcal B}}
 \newcommand{\depsreq}{{\mathcal G}}
 
+\newcommand{\allsrcs}{\set U}
+
 \newcommand{\patchof}[1]{\patch ( #1 ) }
 \newcommand{\baseof}[1]{\base ( #1 ) }
 \newcommand{\depsreqof}[1]{\depsreq ( #1 ) }
 
+\newcommand{\foreign}{\pa F}
+\newcommand{\isforeign}[1]{#1 \in \foreign}
+
 \newcommand{\allpatches}{\Upsilon}
 \newcommand{\assign}{\leftarrow}
 \newcommand{\iassign}{\leftarrow}
@@ -146,6 +151,8 @@
 \newcommand{\proofstarts}{{\it Proof:}}
 \newcommand{\proof}[1]{\proofstarts #1 $\qed$}
 
+\newcommand{\statement}[2]{\[\eqn{ #1 }{ #2 }\]}
+
 \newcommand{\gathbegin}{\begin{gather} \tag*{}}
 \newcommand{\gathnext}{\\ \tag*{}}
 
@@ -166,9 +173,13 @@
 \input{create-tip.tex}
 \input{anticommit.tex}
 \input{merge.tex}
+\input{pseudomerge.tex}
 
 \chapter{Update strategy}
 
 \input{strategy.tex}
+\input{ranking.tex}
+\input{trav-alg.tex}
+\input{trav-proofs.tex}
 
 \end{document}