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:
91c80c5
)
strategy: wip
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 30 Apr 2012 10:30:46 +0000
(11:30 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 30 Apr 2012 10:30:46 +0000
(11:30 +0100)
strategy.tex
patch
|
blob
|
history
diff --git
a/strategy.tex
b/strategy.tex
index 26907129b2ab120c5e473fb24a4959a509f011e8..3f54451dcd698714e0326797f62f1483bbc86ab7 100644
(file)
--- a/
strategy.tex
+++ b/
strategy.tex
@@
-37,7
+37,7
@@
the original, current, updated, and final values.
The planning phase computes:
\begin{itemize*}
-\item{ The relation $\hasdirdep$ and hence the
ordering
$\hasdep$. }
+\item{ The relation $\hasdirdep$ and hence the
partial order
$\hasdep$. }
\item{ For each commit set $\pc$, the order in which to merge
$E_{\pc,j} \in \set E_{\pc}$. }
\item{ For each $E_{\pc,j}$ an intended merge base $M_{\pc,j}$. }