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:
294a235
)
strategy: Define H in notation
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 10 Aug 2013 14:58:48 +0000
(15:58 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 10 Aug 2013 14:58:48 +0000
(15:58 +0100)
strategy.tex
patch
|
blob
|
history
diff --git
a/strategy.tex
b/strategy.tex
index a4716b313dd577c5e74c6e1a7afe4f39ba8be082..e2017c34c3fcd516d308438ab5c6f33f3b577583 100644
(file)
--- a/
strategy.tex
+++ b/
strategy.tex
@@
-54,6
+54,13
@@
$\bigforall_{E \in \pendsof{\set X}{\p}} E \le T$
$\bigcup_{\p \in \allpatches} \set H^{\pn} \cup \set H^{\py}$.
All the input commits to the update algorithm. (See below.)
$\bigcup_{\p \in \allpatches} \set H^{\pn} \cup \set H^{\py}$.
All the input commits to the update algorithm. (See below.)
+\item[ $\set H^{\pc^{_=/-}}$ ]
+
+The existing head commit(s) $\set H$ of the branch $\pc^{+/-}$.
+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).
+
%\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.
@@
-76,8
+83,6
@@
all of its dependencies will be updated.
\item[ $h : \pc^{+/-} \mapsto \set H^{\pc^{+/-}}$ ]
Function for getting the existing heads $\set H$ of the branch $\pc^{+/-}$.
\item[ $h : \pc^{+/-} \mapsto \set H^{\pc^{+/-}}$ ]
Function for getting the existing heads $\set H$ of the branch $\pc^{+/-}$.
-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.
\item[ $g : \pc, \Gamma \mapsto \Gamma'$ ]
Function to allow explicit adjustment of the direct dependencies
\item[ $g : \pc, \Gamma \mapsto \Gamma'$ ]
Function to allow explicit adjustment of the direct dependencies