chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strategy notation: introduce \allsrcs
[topbloke-formulae.git]
/
article.tex
diff --git
a/article.tex
b/article.tex
index 1e7adc26461f2083df2e4199726814428a396255..475477f1ac8fedadeb1b0ccde61eb77aaeb12bdd 100644
(file)
--- a/
article.tex
+++ b/
article.tex
@@
-92,10
+92,15
@@
\newcommand{\base}{{\mathcal B}}
\newcommand{\depsreq}{{\mathcal G}}
\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{\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{\allpatches}{\Upsilon}
\newcommand{\assign}{\leftarrow}
\newcommand{\iassign}{\leftarrow}
@@
-166,9
+171,13
@@
\input{create-tip.tex}
\input{anticommit.tex}
\input{merge.tex}
\input{create-tip.tex}
\input{anticommit.tex}
\input{merge.tex}
+\input{pseudomerge.tex}
\chapter{Update strategy}
\input{strategy.tex}
\chapter{Update strategy}
\input{strategy.tex}
+\input{ranking.tex}
+\input{trav-alg.tex}
+\input{trav-proofs.tex}
\end{document}
\end{document}