wip create tip

[topbloke-formulae.git] / article.tex

diff --git a/article.tex b/article.tex
index 84b95b2958b0b59273d62f62ea4a63c7cb655d92..44942ff2e6524da61a2d7cce059d249ab88aec61 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -293,6 +293,26 @@ by the LHS.  And $A \le A''$.
 }\]
 xxx proof tbd
 
+\[ \eqn{Ingredients Prevent Replay:}{
+  \left[
+    {C \hasparents \set A} \land
+   \\
+    \left(
+      D \isin C \implies
+       D = C \lor
+       \Largeexists_{A \in \set A} D \isin A
+    \right)
+  \right] \implies \left[
+    D \isin C \implies D \le C
+  \right]
+}\]
+\proof{
+  Trivial for $D = C$.  Consider some $D \neq C$, $D \isin C$.
+  By the preconditions, there is some $A$ s.t. $D \in \set A$
+  and $D \isin A$.  By No Replay for $A$, $D \le A$.  And
+  $A \le C$ so $D \le C$.
+}
+
 \[ \eqn{Totally Foreign Contents:}{
   \bigforall_{C \hasparents \set A}
    \left[
@@ -312,37 +332,6 @@ If $D \neq C$ then $D \le A$ where $A \in \set A$.  By Foreign
 Contents of $A$, $\patchof{D} = \bot$.
 }
 
-\subsection{No Replay for Merge Results}
-
-If we are constructing $C$, with,
-\gathbegin
-  \mergeof{C}{L}{M}{R}
-\gathnext
-  L \le C
-\gathnext
-  R \le C
-\end{gather}
-No Replay is preserved.  \proofstarts
-
-\subsubsection{For $D=C$:} $D \isin C, D \le C$.  OK.
-
-\subsubsection{For $D \isin L \land D \isin R$:}
-$D \isin C$.  And $D \isin L \implies D \le L \implies D \le C$.  OK.
-
-\subsubsection{For $D \neq C \land D \not\isin L \land D \not\isin R$:}
-$D \not\isin C$.  OK.
-
-\subsubsection{For $D \neq C \land (D \isin L \equiv D \not\isin R)
- \land D \not\isin M$:}
-$D \isin C$.  Also $D \isin L \lor D \isin R$ so $D \le L \lor D \le
-R$ so $D \le C$.  OK.
-
-\subsubsection{For $D \neq C \land (D \isin L \equiv D \not\isin R)
- \land D \isin M$:}
-$D \not\isin C$.  OK.
-
-$\qed$
-
 \section{Commit annotation}
 
 We annotate each Topbloke commit $C$ with:
@@ -389,7 +378,8 @@ This also covers Topbloke-generated commits on plain git branches:
 Topbloke strips the metadata when exporting.
 
 \subsection{No Replay}
-Trivial.
+
+Ingredients Prevent Replay applies.  $\qed$
 
 \subsection{Unique Base}
 If $A, C \in \py$ then by Calculation of Ends for
@@ -474,7 +464,7 @@ Given $L$, create a Topbloke base branch initial commit $B$.
 \gathbegin
  B \hasparents \{ L \}
 \gathnext
- \patchof{B} = \pan{B}
+ \patchof{B} = \pan{Q}
 \gathnext
  D \isin B \equiv D \isin L \lor D = B
 \end{gather}
@@ -485,24 +475,20 @@ Given $L$, create a Topbloke base branch initial commit $B$.
  \patchof{L} = \pa{L} \lor \patchof{L} = \bot
 }\]
 \[ \eqn{ Non-recursion }{
- L \not\in \pa{B}
+ L \not\in \pa{Q}
 }\]
 
 \subsection{No Replay}
 
-If $\patchof{L} = \pa{L}$, trivial by Base Acyclic for $L$.
-
-If $\patchof{L} = \bot$, consider some $D \isin B$.  $D \neq B$.
-Thus $D \isin L$.  So by No Replay of $D$ in $L$, $D \le L$.
-Thus $D \le B$.
+Ingredients Prevent Replay applies.  $\qed$
 
 \subsection{Unique Base}
 
-Not applicable. $\qed$
+Not applicable.
 
 \subsection{Tip Contents}
 
-Not applicable. $\qed$
+Not applicable.
 
 \subsection{Base Acyclic}
 
@@ -511,6 +497,8 @@ Consider some $D \isin B$.  If $D = B$, $D \in \pn$, OK.
 If $D \neq B$, $D \isin L$.  By No Replay of $D$ in $L$, $D \le L$.
 Thus by Foreign Contents of $L$, $\patchof{D} = \bot$.  OK.
 
+xxx this is wrong
+
 $\qed$
 
 \subsection{Coherence and Patch Inclusion}
@@ -523,11 +511,54 @@ and $L \nothaspatch \p \implies B \nothaspatch P$.
 
 $\qed$.
 
-xxx unfinished
+\subsection{Foreign Inclusion}
+
+Consider some $D$ s.t. $\patchof{D} = \bot$.  $D \neq B$
+so $D \isin B \equiv D \isin L$.
+By Foreign Inclusion of $D$ in $L$, $D \isin L \equiv D \le L$.
+And by Exact Ancestors $D \le L \equiv D \le B$.
+So $D \isin B \equiv D \le B$.  $\qed$
+
+\subsection{Foreign Contents}
+
+Not applicable.
 
 \section{Create Tip}
 
-xxx tbd
+Given a Topbloke base $B$, create a tip branch initial commit B.
+\gathbegin
+ C \hasparents \{ B \}
+\gathnext
+ \patchof{B} = \pay{Q}
+\gathnext
+ D \isin C \equiv D \isin B \lor D = C
+\end{gather}
+
+\subsection{Conditions}
+
+\[ \eqn{ Ingredients }{
+ \patchof{B} = \pan{Q}
+}\]
+
+\subsection{No Replay}
+
+Ingredients Prevent Replay applies.  $\qed$
+
+\subsection{Unique Base}
+
+Trivially, $\pendsof{C}{\pan{Q}} = \{B\}$ so $\baseof{C} = B$.
+
+\subsection{Tip Contents}
+
+Consider some arbitrary commit $D$.  If $D = C$, trivially satisfied.
+
+If $D \neq C$, $D \isin C \equiv D \isin B$.
+By Base Acyclic of $B$, $D \isin B \implies D \not\in \pay{Q}$.
+So $D \isin C \equiv D \isin \baseof{B}$.
+
+$\qed$
+
+xxx up to here
 
 \section{Anticommit}
 
@@ -557,7 +588,7 @@ R^+ \in \pry \land R^- = \baseof{R^+}
  L \haspatch \pry
 }\]
 
-\subsection{Ordering of ${L, R^+, R^-}$:}
+\subsection{Ordering of Ingredients:}
 
 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$.
@@ -568,7 +599,10 @@ is a descendant, not an ancestor, of the 2nd parent.)
 
 \subsection{No Replay}
 
-No Replay for Merge Results applies.  $\qed$
+By definition of $\merge$,
+$D \isin C \implies D \isin L \lor D \isin R^- \lor D = C$.
+So, by Ordering of Ingredients,
+Ingredients Prevent Replay applies.  $\qed$
 
 \subsection{Desired Contents}
 
@@ -654,7 +688,7 @@ $\qed$
 
 \subsection{Foreign Contents}
 
-Not applicable. $\qed$
+Not applicable.
 
 \section{Merge}
 
@@ -722,7 +756,10 @@ is therefore consistent with our scheme.
 
 \subsection{No Replay}
 
-No Replay for Merge Results applies.  $\qed$
+By definition of $\merge$,
+$D \isin C \implies D \isin L \lor D \isin R \lor D = C$.
+So, by Ingredients,
+Ingredients Prevent Replay applies.  $\qed$
 
 \subsection{Unique Base}