wip exclusive haspatch - notation

diff --git a/article.tex b/article.tex
index 459e12d48024c1ad5ceea5a4559fb1a31f8a6d23..5d8f85f670598985da7c05ce47d6673a4f648021 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -26,10 +26,11 @@
 \newcommand{\has}{\sqsupseteq}
 \newcommand{\isin}{\sqsubseteq}
 
-\newcommand{\nothaspatch}{\mathrel{\,\not\!\not\relax\haspatch}}
+\newcommand{\nothaspatch}{\mathrel{\,\!\not\relax\haspatch}}
 \newcommand{\notpatchisin}{\mathrel{\,\not\!\not\relax\patchisin}}
 \newcommand{\haspatch}{\sqSupset}
 \newcommand{\patchisin}{\sqSubset}
+\newcommand{\zhaspatch}{\mathrel{\sqSupset_{\degree}}}
 
         \newif\ifhidehack\hidehackfalse
         \DeclareRobustCommand\hidefromedef[2]{%

diff --git a/notation.tex b/notation.tex
index 2f310bd612d6437700709b3b6d2b9a524f5a20f2..04f8c2e7494017f901803559e2340260b5e00625 100644 (file)
--- a/notation.tex
+++ b/notation.tex
@@ -49,15 +49,20 @@ $ \pendsof{C}{\pn} = \{ \baseof{C} \} $ where $ C \in \py $.
 A partial function from commits to commits.
 See Unique Base, below.
 
-\item[ $ C \haspatch \p $ ]
+\item[ $ C \zhaspatch \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$.
 
-Note that $\haspatch$ and $\nothaspatch$ are not mutually exclusive.
+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