\newcommand{\patch}{{\mathcal P}}
\newcommand{\base}{{\mathcal B}}
-\newcommand{\depsreq}{{\mathcal D}}
+\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}
\newcommand{\hasdirdep}{\succ_{\mkern-7.0mu _1}}
\newcommand{\hasdep}{\succ}
\newcommand{\isdep}{\prec}
-\newcommand{\isdirdep}{\prec_{\mkern-7.0mu _1}}
-
-\newcommand{\tipz}{ T^0 }
-\newcommand{\tipc}{ T }
-\newcommand{\tipu}{ T' }
-\newcommand{\tipf}{ T^* }
+\newcommand{\isdirdep}{\prec_{\mkern-18.0mu _1}{\mkern+10mu}}
-\newcommand{\tipza}[1]{ \tipz_{#1} }
-\newcommand{\tipca}[1]{ \tipc_{#1} }
-\newcommand{\tipua}[1]{ \tipu_{#1} }
-\newcommand{\tipfa}[1]{ \tipf_{#1} }
-
-\newcommand{\tipzc}{ \tipza \pc }
-\newcommand{\tipcc}{ \tipca \pc }
-\newcommand{\tipuc}{ \tipua \pc }
-\newcommand{\tipfc}{ \tipfa \pc }
+\newcommand{\tip}{ T }
+\newcommand{\tipa}[1]{ \tip^{#1} }
+\newcommand{\tipcn}{ \tipa \pcn }
+\newcommand{\tipcy}{ \tipa \pcy }
+\newcommand{\tipdn}{ \tipa \pdn }
+\newcommand{\tipdy}{ \tipa \pdy }
%\newcommand{\bigforall}{\mathop{\hbox{\huge$\forall$}}}
\newcommand{\bigforall}{%
\newcommand{\proofstarts}{{\it Proof:}}
\newcommand{\proof}[1]{\proofstarts #1 $\qed$}
+\newcommand{\statement}[2]{\[\eqn{ #1 }{ #2 }\]}
+
\newcommand{\gathbegin}{\begin{gather} \tag*{}}
\newcommand{\gathnext}{\\ \tag*{}}
\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}