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:
39aa11f
)
strategy: define W in Notation
master
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 10 Aug 2013 19:44:04 +0000
(20:44 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 10 Aug 2013 19:44:04 +0000
(20:44 +0100)
strategy.tex
patch
|
blob
|
history
diff --git
a/strategy.tex
b/strategy.tex
index 499ec3414d611b4017d802efb227af49ca270645..27c9fd82b98d79868af1d126318e16004d42c2ae 100644
(file)
--- a/
strategy.tex
+++ b/
strategy.tex
@@
-61,6
+61,12
@@
These are the heads which will be merged and used in this update.
This will include the current local and remote git refs, as desired.
Obtained from the function $h$ (see below).
This will include the current local and remote git refs, as desired.
Obtained from the function $h$ (see below).
+\item[ $W$ ]
+
+During the Traversal phase, when we generate new commits, the working
+head of the branch we are working on. Starts at $W_0$, updated as the
+algorithm progresses, and ultimately used to set $T$.
+
%\item[ $\set E_{\pc}$ ]
%$ \bigcup_i \pendsof{S_{\pc,i}}{\pc} $.
%All the ends of $\pc$ in the sources.
%\item[ $\set E_{\pc}$ ]
%$ \bigcup_i \pendsof{S_{\pc,i}}{\pc} $.
%All the ends of $\pc$ in the sources.