chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
519fc3c
)
strategy: wip traversal
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 27 May 2012 18:04:31 +0000
(19:04 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 27 May 2012 18:04:31 +0000
(19:04 +0100)
strategy.tex
patch
|
blob
|
history
diff --git
a/strategy.tex
b/strategy.tex
index ad8db15e04f50571564950dd05bfb2fb0e75fde9..48d93d77954256085eb3d44c0dcf0eb52272d065 100644
(file)
--- a/
strategy.tex
+++ b/
strategy.tex
@@
-211,8
+211,14
@@
and corresponding merge bases $M^{\pcn}_i = M_i$.
\section{Traversal phase}
+For each patch $C \in \allpatches$ in topological order by $\hasdep$,
+lowest first:
+\begin{enumerate}
+
+\item Optionally, attempt $\alg{Merge-Base}(\pc)$.
+\end{enumerate}
\section{Planning phase}