From cb07ad8fa5136f4caf2de5296b916749e6fcd84a Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 11 Mar 2012 12:23:37 +0000 Subject: [PATCH] anticommit coherence --- article.tex | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/article.tex b/article.tex index 90acf96..4b64118 100644 --- a/article.tex +++ b/article.tex @@ -496,6 +496,24 @@ Now from Desired Contents, above, $D \isin C \implies D \isin L \lor D = C$, which thus $\implies D \not\in \py$. $\qed$. +\subsection{Coherence and Patch Inclusion} + +Need to consider some $D \in \py$. By Into Base, $D \neq C$. + +\subsubsection{For $\p = \pr$:} +By Desired Contents, above, $D \not\isin C$. +So $C \nothaspatch \pr$. + +\subsubsection{For $\p \neq \pr$:} +By Desired Contents, $D \isin C \equiv D \isin L$ +(since $D \in \py$ so $D \not\in \pry$). + +If $L \nothaspatch \p$, $D \not\isin L$ so $D \not\isin C$. +So $L \nothaspatch \p \implies C \nothaspatch \p$. + +Whereas if $L \haspatch \p$, $D \isin L \equiv D \le L$. +so $L \haspatch \p \implies C \haspatch \p$. + \section{Merge} Merge commits $L$ and $R$ using merge base $M$ ($M < L, M < R$): -- 2.30.2