chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wip exclusive haspatch - notation
[topbloke-formulae.git]
/
notation.tex
diff --git
a/notation.tex
b/notation.tex
index 1e19122ba76b77fa887775e9bad8827ac28fa9a6..04f8c2e7494017f901803559e2340260b5e00625 100644
(file)
--- a/
notation.tex
+++ b/
notation.tex
@@
-49,14
+49,21
@@
$ \pendsof{C}{\pn} = \{ \baseof{C} \} $ where $ C \in \py $.
A partial function from commits to commits.
See Unique Base, below.
A partial function from commits to commits.
See Unique Base, below.
-\item[ $ C \haspatch \p $ ]
+\item[ $ C \
z
haspatch \p $ ]
$\displaystyle \bigforall_{D \in \py} D \isin C \equiv D \le C $.
~ Informally, $C$ has all the reachable contents of $\p$.
$\displaystyle \bigforall_{D \in \py} D \isin C \equiv D \le C $.
~ Informally, $C$ has all the reachable contents of $\p$.
+\item[ $ C \haspatch \p $ ]
+$\displaystyle C \zhaspatch \p \land \exists_{D \in \py} D \le C $.
+~ Informally, $C$ nontrivially has all the reachable contents of $\p$.
+
\item[ $ C \nothaspatch \p $ ]
$\displaystyle \bigforall_{D \in \py} D \not\isin C $.
~ Informally, $C$ has none of the contents of $\p$.
\item[ $ C \nothaspatch \p $ ]
$\displaystyle \bigforall_{D \in \py} D \not\isin C $.
~ Informally, $C$ has none of the contents of $\p$.
+Note that $\zhaspatch$ and $\nothaspatch$ are not mutually exclusive.
+$\haspatch$ and $\nothaspatch$ are.
+
Commits on Non-Topbloke branches are $\nothaspatch \p$ for all $\p$. This
includes commits on plain git branches made by applying a Topbloke
patch. If a Topbloke
Commits on Non-Topbloke branches are $\nothaspatch \p$ for all $\p$. This
includes commits on plain git branches made by applying a Topbloke
patch. If a Topbloke