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:
ad178f9
)
notation: fixes from annotations
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 12 Jul 2012 22:57:57 +0000
(23:57 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 12 Jul 2012 22:57:57 +0000
(23:57 +0100)
notation.tex
patch
|
blob
|
history
diff --git
a/notation.tex
b/notation.tex
index 82a2e647dbac266a769374a422727af8c92e6663..19cf243733e1a9ba8edce18d7d7a70a8e0fb1097 100644
(file)
--- a/
notation.tex
+++ b/
notation.tex
@@
-31,20
+31,20
@@
are respectively the base and tip git branches. $\p$ may be used
where the context requires a set, in which case the statement
is to be taken as applying to both $\py$ and $\pn$.
All of these sets will be disjoint by construction
where the context requires a set, in which case the statement
is to be taken as applying to both $\py$ and $\pn$.
All of these sets will be disjoint by construction
-(see Invariants, below).
Hence:
+(see Invariants, below).
\item[ $\foreign$ ]
The set of all commits which are not part of a Topbloke branch. We
\item[ $\foreign$ ]
The set of all commits which are not part of a Topbloke branch. We
-call these foreign commits.
-
-\item[ $\set A$, $\set P$, $\ldots$ ]
-Arbitrary sets of commits. Maybe $\set P = \p$ i.e.\ some $\py$ or $\pn$, but
-maybe not.
+call these foreign commits. Hence:
\item[ $ \patchof{ C } $ ]
Either $\p$ s.t. $ C \in \p $, or $\foreign$.
A function from commits to patches' sets $\p$.
\item[ $ \patchof{ C } $ ]
Either $\p$ s.t. $ C \in \p $, or $\foreign$.
A function from commits to patches' sets $\p$.
+\item[ $\set A$, $\set P$, $\ldots$ ]
+Arbitrary sets of commits. Maybe $\set P = \p$ i.e.\ some $\py$ or $\pn$, but
+maybe not.
+
\item[ $ \pancsof{C}{\set P} $ ]
$ \{ A \; | \; A \le C \land A \in \set P \} $
i.e. all the ancestors of $C$
\item[ $ \pancsof{C}{\set P} $ ]
$ \{ A \; | \; A \le C \land A \in \set P \} $
i.e. all the ancestors of $C$