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
merge reference to no replay fix ref to be more regular
[topbloke-formulae.git]
/
article.tex
diff --git
a/article.tex
b/article.tex
index 4b64118da837bfe24cfbfe7f3f59f5a8fab8e1fd..b7df641e68703266c1729e1c3abf32680e35f805 100644
(file)
--- a/
article.tex
+++ b/
article.tex
@@
-439,11
+439,17
@@
Used for removing a branch dependency.
L \haspatch \pry
}\]
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^+$
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}
\subsection{Desired Contents}
@@
-571,7
+577,7
@@
Merge Ends condition applies. Good.
\subsection{No Replay}
\subsection{No Replay}
-See No Replay for Merge Results.
+No Replay for Merge Results applies. $\qed$
\subsection{Unique Base}
\subsection{Unique Base}
@@
-645,7
+651,8
@@
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 M \nothaspatch \p$.
+$M \haspatch \p \implies C \nothaspatch \p$.
+$M \nothaspatch \p \implies C \haspatch \p$.
\proofstarts
\proofstarts