X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=article.tex;h=77a1098b1680f4b38d19963ff50891c8384808b2;hb=8eec5c21633f6eb6a2709df7d8d65f576c35124b;hp=4b64118da837bfe24cfbfe7f3f59f5a8fab8e1fd;hpb=cb07ad8fa5136f4caf2de5296b916749e6fcd84a;p=topbloke-formulae.git

diff --git a/article.tex b/article.tex
index 4b64118..77a1098 100644
--- a/article.tex
+++ b/article.tex
@@ -439,11 +439,17 @@ Used for removing a branch dependency.
  L \haspatch \pry
 }\]
 
-\subsection{No Replay}
+\subsection{Ordering of ${L, R^+, R^-}$:}
 
 By Unique Tip, $R^+ \le L$.  By definition of $\base$, $R^- \le R^+$
-so $R^- \le L$.  So $R^+ \le C$ and $R^- \le C$ and No Replay for
-Merge Results applies. $\qed$
+so $R^- \le L$.  So $R^+ \le C$ and $R^- \le C$.
+
+(Note that the merge base $R^+ \not\le R^-$, i.e. the merge base is
+later than one of the branches to be merged.)
+
+\subsection{No Replay}
+
+No Replay for Merge Results applies.  $\qed$
 
 \subsection{Desired Contents}
 
@@ -514,6 +520,21 @@ 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{Foreign Inclusion}
+
+Consider some $D$ s.t. $\patchof{D} = \bot$.  $D \neq C$.
+So by Desired Contents $D \isin C \equiv D \isin L$.
+By Foreign Inclusion of $D$ in $L$, $D \isin L \equiv D \le L$.
+So $D \isin C \equiv D \le L$.
+
+xxx up to here
+
+By Tip Contents of $R^+$, $D \isin R^+ \equiv D \isin \baseof{R^+}$
+i.e. $\equiv D \isin R^-$.
+So by $\merge$, $D \isin C \equiv D \isin L$.
+
+Thus $D \isin C \equiv $
+
 \section{Merge}
 
 Merge commits $L$ and $R$ using merge base $M$ ($M < L, M < R$):
@@ -571,7 +592,7 @@ Merge Ends condition applies.  Good.
 
 \subsection{No Replay}
 
-See No Replay for Merge Results.
+No Replay for Merge Results applies.  $\qed$
 
 \subsection{Unique Base}
 
@@ -645,7 +666,8 @@ So indeed $L \haspatch \p \land R \haspatch \p \implies C \haspatch \p$.
 
 \subsubsection{For (wlog) $X \not\haspatch \p, Y \haspatch \p$:}
 
-$C \haspatch \p \equiv M \nothaspatch \p$.
+$M \haspatch \p \implies C \nothaspatch \p$.
+$M \nothaspatch \p \implies C \haspatch \p$.
 
 \proofstarts