clarify text re non-tb flattened re-inclusion

[topbloke-formulae.git] / article.tex

diff --git a/article.tex b/article.tex
index f73f7229ae114bc2104d3b4b8bb55b0a5b5b49e6..862403f0115e33502da60ae68c5f83b82e95b484 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -152,10 +152,13 @@ $\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$.  
 
-Non-Topbloke commits are $\nothaspatch \p$ for all $\p$; if a Topbloke
+Non-Topbloke commits are $\nothaspatch \p$ for all $\p$.  This
+includes commits on plain git branches made by applying a Topbloke
+patch.  If a Topbloke
 patch is applied to a non-Topbloke branch and then bubbles back to
-the Topbloke patch itself, we hope that git's merge algorithm will
-DTRT or that the user will no longer care about the Topbloke patch.
+the relevant Topbloke branches, we hope that 
+if the user still cares about the Topbloke patch,
+git's merge algorithm will DTRT when trying to re-apply the changes.
 
 \item[ $\displaystyle \mergeof{C}{L}{M}{R} $ ]
 The contents of a git merge result:
@@ -690,26 +693,6 @@ $\baseof{C} = R$ so $D \isin C \equiv D \isin \baseof{C}$.  OK.
 
 $\qed$
 
-xxx junk after here
-
-%D \in \py$:}
-
-
-
-xxx the coherence is not that useful ?
-
-$L \haspatch \p$ by 
-
-xxx need to recheck this
-
-$C \in \py$ $C \haspatch P$ so $D \isin C \equiv D \le C$.  OK.
-
-\subsubsection{For $L \in \py, D \not\in \py, R \in \py$:}
-
-Tip Contents for $L$: $D \isin L \equiv D \isin \baseof{L}$.
-
-Tip Contents for $R$: $D \isin R \equiv D \isin \baseof{R}$.
-
-But by Tip Merge, $\baseof{R} \ge \baseof{L}$
+xxx up to here, need to prove other things about merges
 
 \end{document}