chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.git-revid from my trains.git
[topbloke-formulae.git]
/
lemmas.tex
diff --git
a/lemmas.tex
b/lemmas.tex
index aeb656479c497363460d14de95af921d326ccd58..44dd26039c6e7a5400102c6d9d26dead824d2989 100644
(file)
--- a/
lemmas.tex
+++ b/
lemmas.tex
@@
-53,8
+53,8
@@
So by Base Acyclic $D \isin B \implies D \notin \py$.
\end{cases}
}\]
\end{cases}
}\]
-\subsection{Tip
Self Inpatch
}
-Given
Exclusive Tip Contents and
Base Acyclic for $C$,
+\subsection{Tip
Own Contents
}
+Given Base Acyclic for $C$,
$$
\bigforall_{C \in \py} C \haspatch \p \land \neg[ C \nothaspatch \p ]
$$
$$
\bigforall_{C \in \py} C \haspatch \p \land \neg[ C \nothaspatch \p ]
$$
@@
-126,6
+126,7
@@
Otherwise, $E$ meets all the conditions for $\pends$.
}
\subsection{Ingredients Prevent Replay}
}
\subsection{Ingredients Prevent Replay}
+Given conformant commits $A \in \set A$,
$$
\left[
{C \hasparents \set A} \land
$$
\left[
{C \hasparents \set A} \land
@@
-142,12
+143,13
@@
$$
$$
\proof{
Trivial for $D = C$. Consider some $D \neq C$, $D \isin C$.
$$
\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$
+ By the preconditions, there is some $A$ s.t. $
A
\in \set A$
and $D \isin A$. By No Replay for $A$, $D \le A$. And
$A \le C$ so $D \le C$.
}
\subsection{Simple Foreign Inclusion}
and $D \isin A$. By No Replay for $A$, $D \le A$. And
$A \le C$ so $D \le C$.
}
\subsection{Simple Foreign Inclusion}
+Given a conformant commit $L$,
$$
\left[
C \hasparents \{ L \}
$$
\left[
C \hasparents \{ L \}
@@
-169,6
+171,7
@@
So $D \isin C \equiv D \le C$.
}
\subsection{Totally Foreign Contents}
}
\subsection{Totally Foreign Contents}
+Given conformant commits $A \in \set A$,
$$
\left[
C \hasparents \set A \land
$$
\left[
C \hasparents \set A \land