X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=article.tex;h=39a12875eb76a7266a477d76063a98ac6e5457de;hb=dc267ea3dd7ebf73ee7b8c000c483e69207153c5;hp=2f512f4c96e2215b002ae886742a107753823bb2;hpb=81ac90d1051946e902cd316e19c733ddf26ad1c7;p=topbloke-formulae.git

diff --git a/article.tex b/article.tex
index 2f512f4..39a1287 100644
--- a/article.tex
+++ b/article.tex
@@ -65,8 +65,8 @@
 \newcommand{\patchof}[1]{\patch ( #1 ) }
 \newcommand{\baseof}[1]{\base ( #1 ) }
 
+\newcommand{\eqntag}[2]{ #2 \tag*{\mbox{#1}} }
 \newcommand{\eqn}[2]{ #2 \tag*{\mbox{\bf #1}} }
-\newcommand{\corrolary}[1]{ #1 \tag*{\mbox{\it Corrolary.}} }
 
 %\newcommand{\bigforall}{\mathop{\hbox{\huge$\forall$}}}
 \newcommand{\bigforall}{%
@@ -121,7 +121,7 @@ A patch $\p$ consists of two sets of commits $\pn$ and $\py$, which
 are respectively the base and tip git branches.  $\p$ may be used
 where the context requires a set, in which case the statement
 is to be taken as applying to both $\py$ and $\pn$.
-All these sets are distinct.  Hence:
+None of these sets overlap.  Hence:
 
 \item[ $ \patchof{ C } $ ]
 Either $\p$ s.t. $ C \in \p $, or $\bot$.  
@@ -206,7 +206,7 @@ Ie, the two limbs of the RHS of Tip Contents are mutually exclusive.
 Let $B = \baseof{C}$ in $D \isin \baseof{C}$.  Now $B \in \pn$.
 So by Base Acyclic $D \isin B \implies D \notin \py$.
 }
-\[ \corrolary{
+\[ \eqntag{{\it Corollary - equivalent to Tip Contents}}{
   \bigforall_{C \in \py} D \isin C \equiv
   \begin{cases}
     D \in \py : & D \le C \\
@@ -488,12 +488,25 @@ We will occasionally use $X,Y$ s.t. $\{X,Y\} = \{L,R\}$.
       \text{otherwise} : & \false
    \end{cases}
 }\]
-\[ \eqn{ Merge Ends }{
+\[ \eqn{ Merge Acyclic }{
+    L \in \pn
+   \implies
+    R \nothaspatch \p
+}\]
+\[ \eqn{ Removal Merge Ends }{
     X \not\haspatch \p \land
     Y \haspatch \p \land
-    E \in \pendsof{X}{\py}
+    M \haspatch \p
   \implies
-    E \le Y
+    \pendsof{Y}{\py} = \pendsof{M}{\py}
+}\]
+\[ \eqn{ Addition Merge Ends }{
+    X \not\haspatch \p \land
+    Y \haspatch \p \land
+    M \nothaspatch \p
+   \implies \left[
+    \bigforall_{E \in \pendsof{X}{\py}} E \le Y
+   \right]
 }\]
 
 \subsection{No Replay}
@@ -536,19 +549,19 @@ $\qed$
 
 \subsection{Coherence and patch inclusion}
 
-Need to determine $C \haspatch P$ based on $L,M,R \haspatch P$.
+Need to determine $C \haspatch \p$ based on $L,M,R \haspatch \p$.
 This involves considering $D \in \py$.  
 
-\subsubsection{For $L \nothaspatch P, R \nothaspatch P$:}
+\subsubsection{For $L \nothaspatch \p, R \nothaspatch \p$:}
 $D \not\isin L \land D \not\isin R$.  $C \not\in \py$ (otherwise $L
-\in \py$ ie $L \haspatch P$ by Tip Self Inpatch).  So $D \neq C$.
-Applying $\merge$ gives $D \not\isin C$ i.e. $C \nothaspatch P$.
+\in \py$ ie $L \haspatch \p$ by Tip Self Inpatch).  So $D \neq C$.
+Applying $\merge$ gives $D \not\isin C$ i.e. $C \nothaspatch \p$.
 
-\subsubsection{For $L \haspatch P, R \haspatch P$:}
+\subsubsection{For $L \haspatch \p, R \haspatch \p$:}
 $D \isin L \equiv D \le L$ and $D \isin R \equiv D \le R$.
 (Likewise $D \isin X \equiv D \le X$ and $D \isin Y \equiv D \le Y$.)
 
-Consider $D = C$: $D \isin C$, $D \le C$, OK for $C \haspatch P$.
+Consider $D = C$: $D \isin C$, $D \le C$, OK for $C \haspatch \p$.
 
 For $D \neq C$: $D \le C \equiv D \le L \lor D \le R
  \equiv D \isin L \lor D \isin R$.  
@@ -556,24 +569,112 @@ For $D \neq C$: $D \le C \equiv D \le L \lor D \le R
 
 Consider $D \neq C, D \isin X \land D \isin Y$:
 By $\merge$, $D \isin C$.  Also $D \le X$ 
-so $D \le C$.  OK for $C \haspatch P$.
+so $D \le C$.  OK for $C \haspatch \p$.
 
 Consider $D \neq C, D \not\isin X \land D \not\isin Y$:
 By $\merge$, $D \not\isin C$.  
 And $D \not\le X \land D \not\le Y$ so $D \not\le C$.  
-OK for $C \haspatch P$.
+OK for $C \haspatch \p$.
 
 Remaining case, wlog, is $D \not\isin X \land D \isin Y$.
 $D \not\le X$ so $D \not\le M$ so $D \not\isin M$.  
 Thus by $\merge$, $D \isin C$.  And $D \le Y$ so $D \le C$.
-OK for $C \haspatch P$.
+OK for $C \haspatch \p$.
 
-So indeed $L \haspatch P \land R \haspatch P \implies C \haspatch P$.
+So indeed $L \haspatch \p \land R \haspatch \p \implies C \haspatch \p$.
 
-\subsubsection{For (wlog) $X \not\haspatch P, Y \haspatch P$:}
+\subsubsection{For (wlog) $X \not\haspatch \p, Y \haspatch \p$:}
 
-$C \haspatch P \equiv C \nothaspatch M$.
+$C \haspatch \p \equiv M \nothaspatch \p$.
 
 \proofstarts
 
+One of the Merge Ends conditions applies.  
+Recall that we are considering $D \in \py$.
+$D \isin Y \equiv D \le Y$.  $D \not\isin X$.
+We will show for each of
+various cases that $D \isin C \equiv M \nothaspatch \p \land D \le C$
+(which suffices by definition of $\haspatch$ and $\nothaspatch$).
+
+Consider $D = C$:  Thus $C \in \py, L \in \py$, and by Tip
+Self Inpatch $L \haspatch \p$, so $L=Y, R=X$.  By Tip Merge,
+$M=\baseof{L}$.  So by Base Acyclic $D \not\isin M$, i.e.
+$M \nothaspatch \p$.  And indeed $D \isin C$ and $D \le C$.  OK.
+
+Consider $D \neq C, M \nothaspatch P, D \isin Y$:
+$D \le Y$ so $D \le C$.  
+$D \not\isin M$ so by $\merge$, $D \isin C$.  OK.
+
+Consider $D \neq C, M \nothaspatch P, D \not\isin Y$:
+$D \not\le Y$.  If $D \le X$ then
+$D \in \pancsof{X}{\py}$, so by Addition Merge Ends and 
+Transitive Ancestors $D \le Y$ --- a contradiction, so $D \not\le X$.
+Thus $D \not\le C$.  By $\merge$, $D \not\isin C$.  OK.
+
+Consider $D \neq C, M \haspatch P, D \isin Y$:
+$D \le Y$ so $D \in \pancsof{Y}{\py}$ so by Removal Merge Ends
+and Transitive Ancestors $D \in \pancsof{M}{\py}$ so $D \le M$.
+Thus $D \isin M$.  By $\merge$, $D \not\isin C$.  OK.
+
+Consider $D \neq C, M \haspatch P, D \not\isin Y$:
+By $\merge$, $D \not\isin C$.  OK.
+
+$\qed$
+
+\subsection{Base Acyclic}
+
+This applies when $C \in \pn$.
+$C \in \pn$ when $L \in \pn$ so by Merge Acyclic, $R \nothaspatch \p$.
+
+Consider some $D \in \py$.
+
+By Base Acyclic of $L$, $D \not\isin L$.  By the above, $D \not\isin
+R$.  And $D \neq C$.  So $D \not\isin C$.  $\qed$
+
+\subsection{Tip Contents}
+
+xxx up to here
+
+We need worry only about $C \in \py$.  
+And $\patchof{C} = \patchof{L}$
+so $L \in \py$ so $L \haspatch \p$.  We will use the coherence and
+patch inclusion of $C$ as just proved.
+
+Firstly we prove $C \haspatch \p$: If $R \in \py$, this is true by
+coherence/inclusion $C \haspatch \p$.  If $R \not\in \py$ then
+by Tip Merge 
+
+
+We will consider some $D$ and prove the Exclusive Tip Contents form.
+
+
+So by definition of
+$\haspatch$, $D \isin C \equiv D \le C$.  OK.
+
+\subsubsection{For $L \in \py, D \in \py, $:}
+$R \haspatch \p$ so 
+
+\subsubsection{For $L \in \py, D \not\in \py, R \in \py$:}
+
+
+%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}$
+
 \end{document}