chiark / gitweb /
\newcommand{\pcy}{\pay{C}}
\newcommand{\pcn}{\pan{C}}

+\newcommand{\pd}{\pa{D}}
+\newcommand{\pdy}{\pay{D}}
+\newcommand{\pdn}{\pan{D}}
+
\newcommand{\pl}{\pa{L}}
\newcommand{\ply}{\pay{L}}
\newcommand{\pln}{\pan{L}}

\newcommand{\patch}{{\mathcal P}}
\newcommand{\base}{{\mathcal B}}
-\newcommand{\depsreq}{{\mathcal D}}
+\newcommand{\depsreq}{{\mathcal G}}

\newcommand{\patchof}[1]{\patch ( #1 ) }
\newcommand{\baseof}[1]{\base ( #1 ) }
\newcommand{\depsreqof}[1]{\depsreq ( #1 ) }

+\newcommand{\allpatches}{\Upsilon}
+\newcommand{\assign}{\leftarrow}
+\newcommand{\iassign}{\leftarrow}
+%\newcommand{\assign}{' =}
+
+\newcommand{\alg}[1]{\text{\bf #1}}
+\newcommand{\setmerge}{\alg{merge}}
+\newcommand{\setmergeof}[3]{\setmerge\left\langle #1 \;\middle\langle #2 \middle\rangle\; #3 \right\rangle}
+%\newcommand{\setmergeof}[3]{\setmerge\left\lgroup #1 \;\middle\lmoustache\; #2 \;\middle\rmoustache\; #3 \right\rgroup}
+%\newcommand{\setmergeof}[3]{\setmerge\left\rmoustache #1 \middle\rmoustache #2 \middle\lmoustache #3 \right\lmoustache}
+%\newcommand{\setmergeof}[3]{\setmerge\left\lfloor #1 \middle\lfloor #2 \middle\rfloor #3 \right\rfloor}
+
\newcommand{\eqntag}[2]{ #2 \tag*{\mbox{#1}} }
\newcommand{\eqn}[2]{ #2 \tag*{\mbox{\bf #1}} }

\newcommand{\hasdirdep}{\succ_{\mkern-7.0mu _1}}
\newcommand{\hasdep}{\succ}
\newcommand{\isdep}{\prec}
+\newcommand{\isdirdep}{\prec_{\mkern-18.0mu _1}{\mkern+10mu}}

-\newcommand{\grefz}{ T^0 }
-\newcommand{\grefc}{ T }
-\newcommand{\grefu}{ T' }
-\newcommand{\greff}{ T^* }
-
-\newcommand{\grefza}[1]{ \grefz_{#1} }
-\newcommand{\grefca}[1]{ \grefc_{#1} }
-\newcommand{\grefua}[1]{ \grefu_{#1} }
-\newcommand{\greffa}[1]{ \greff_{#1} }
-
-\newcommand{\grefzc}{ \grefza \pc }
-\newcommand{\grefcc}{ \grefca \pc }
-\newcommand{\grefuc}{ \grefua \pc }
-\newcommand{\greffc}{ \greffa \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}{%
\input{anticommit.tex}
\input{merge.tex}

-\chapter{Merge strategy}
+\chapter{Update strategy}

\input{strategy.tex}