From e825f9ef4709f95709d1c1ead218d64675bc2fea Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 1 Mar 2012 01:57:03 +0000 Subject: [PATCH] work --- article.tex | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/article.tex b/article.tex index 3512d9c..3f8bbff 100644 --- 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 }\] -- 2.30.2