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
rename Ingredients Prohibit Replay to Prevent
[topbloke-formulae.git]
/
article.tex
diff --git
a/article.tex
b/article.tex
index 25b529fe8d1197aa75cfd436a035aa5fe190c2e7..8a6bcf4379d7f8748daefd4a1c0f25640c616332 100644
(file)
--- a/
article.tex
+++ b/
article.tex
@@
-293,7
+293,7
@@
by the LHS. And $A \le A''$.
}\]
xxx proof tbd
}\]
xxx proof tbd
-\[ \eqn{Ingredients Pr
ohibi
t Replay:}{
+\[ \eqn{Ingredients Pr
even
t Replay:}{
\left[
{C \hasparents \set A} \land
\\
\left[
{C \hasparents \set A} \land
\\
@@
-379,7
+379,7
@@
Topbloke strips the metadata when exporting.
\subsection{No Replay}
\subsection{No Replay}
-Ingredients Pr
ohibi
t Replay applies. $\qed$
+Ingredients Pr
even
t Replay applies. $\qed$
\subsection{Unique Base}
If $A, C \in \py$ then by Calculation of Ends for
\subsection{Unique Base}
If $A, C \in \py$ then by Calculation of Ends for
@@
-480,7
+480,7
@@
Given $L$, create a Topbloke base branch initial commit $B$.
\subsection{No Replay}
\subsection{No Replay}
-Ingredients Pr
ohibi
t Replay applies. $\qed$
+Ingredients Pr
even
t Replay applies. $\qed$
\subsection{Unique Base}
\subsection{Unique Base}
@@
-567,7
+567,7
@@
is a descendant, not an ancestor, of the 2nd parent.)
By definition of $\merge$,
$D \isin C \implies D \isin L \lor D \isin R^- \lor D = C$.
So, by Ordering of Ingredients,
By definition of $\merge$,
$D \isin C \implies D \isin L \lor D \isin R^- \lor D = C$.
So, by Ordering of Ingredients,
-Ingredients Pr
ohibi
t Replay applies. $\qed$
+Ingredients Pr
even
t Replay applies. $\qed$
\subsection{Desired Contents}
\subsection{Desired Contents}
@@
-724,7
+724,7
@@
is therefore consistent with our scheme.
By definition of $\merge$,
$D \isin C \implies D \isin L \lor D \isin R \lor D = C$.
So, by Ingredients,
By definition of $\merge$,
$D \isin C \implies D \isin L \lor D \isin R \lor D = C$.
So, by Ingredients,
-Ingredients Pr
ohibi
t Replay applies. $\qed$
+Ingredients Pr
even
t Replay applies. $\qed$
\subsection{Unique Base}
\subsection{Unique Base}