work

[topbloke-formulae.git] / article.tex

diff --git a/article.tex b/article.tex
index 3512d9c5418954713d1ea10b36c82c829ce29308..3f8bbff36113fc34d2434a6eb3e54505a51db462 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -109,12 +109,16 @@ A partial function from commits to commits.
 See ``unique base'', below.
 
 \item[ $ C \haspatch \p $ ]
-$ \bigforall_{D \in \py} D \isin C \equiv D \le C $.
-Informally, $C$ has the contents of $\p$.
+$\displaystyle \bigforall_{D \in \py} D \isin C \equiv D \le C $.
+~ Informally, $C$ has the contents of $\p$.
 
-\item[ $\displaystyle C \nothaspatch \p $ ]
+\item[ $ C \nothaspatch \p $ ]
 $\displaystyle \bigforall_{D \in \py} D \not\isin C $.
-~ Informally, $C$ has none of the contents of $\p$.
+~ Informally, $C$ has none of the contents of $\p$.  
+
+Non-Topbloke commits are $\nothaspatch \p$ for all $\p$; if
+a patch is merged into a non-Topbloke branch and we inherit
+it, we hope that git's merge algorithm will DTRT.
 
 \end{basedescript}
 
@@ -131,7 +135,7 @@ $\displaystyle \bigforall_{D \in \py} D \not\isin C $.
     { D \isin \baseof{C} \lor \atop
       (D \in \py \land D \le C) }
 }\]
-\[\eqn{Base non-circ:}{
+\[\eqn{Base acyclic:}{
   \bigforall_{B \in \pn} D \isin B \implies D \notin \py
 }\]