add note about non-exclusivity of \haspatch and \nothaspatch

diff --git a/annotations.tex b/annotations.tex
index 26c9bfd5ea7df893334e46714ea6e891b0ef53be..1bf2fcd5f1d504ebd7d6428d0c4490534dd64ae2 100644 (file)
--- a/annotations.tex
+++ b/annotations.tex
@@ -18,8 +18,10 @@ in the summary in the section for that kind of commit.
 Whether $\baseof{C}$ is required, and if so what the value is, is
 stated in the proof of Unique Base for each kind of commit.
 
 Whether $\baseof{C}$ is required, and if so what the value is, is
 stated in the proof of Unique Base for each kind of commit.
 

-$C \haspatch \pq$ or $\nothaspatch \pq$ is represented as the
-set $\{ \pq | C \haspatch \pq \}$.  Whether $C \haspatch \pq$
+$C \haspatch \pq$ or $\nothaspatch \pq$ is represented as a
+list of $\pq$ for which it is known that $C \haspatch \pq$;
+for any $\pq$ not listed, $C \nothaspatch \pq$.
+Whether to record $C \haspatch \pq$ in a new commit

 is in stated
 (in terms of $I \haspatch \pq$ or $I \nothaspatch \pq$
 for the ingredients $I$)
 is in stated
 (in terms of $I \haspatch \pq$ or $I \nothaspatch \pq$
 for the ingredients $I$)

diff --git a/notation.tex b/notation.tex
index 1e19122ba76b77fa887775e9bad8827ac28fa9a6..2f310bd612d6437700709b3b6d2b9a524f5a20f2 100644 (file)
--- a/notation.tex
+++ b/notation.tex
@@ -57,6 +57,8 @@ $\displaystyle \bigforall_{D \in \py} D \isin C \equiv D \le C $.
 $\displaystyle \bigforall_{D \in \py} D \not\isin C $.
 ~ Informally, $C$ has none of the contents of $\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.
+

 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