From a8c0dda901340bdd4fb4ca3464f0572c0cab3bd4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 16 Mar 2012 23:00:18 +0000 Subject: [PATCH] add note about non-exclusivity of \haspatch and \nothaspatch --- annotations.tex | 6 ++++-- notation.tex | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/annotations.tex b/annotations.tex index 26c9bfd..1bf2fcd 100644 --- 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. -$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$) diff --git a/notation.tex b/notation.tex index 1e19122..2f310bd 100644 --- 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$. +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 -- 2.30.2