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
wip dependency insertion
[topbloke-formulae.git]
/
article.tex
diff --git
a/article.tex
b/article.tex
index 6be7a681549b3164b2a56e3d511dc8cac9c8b719..0615616f7d429a2817d9075b51c78298ce9bc411 100644
(file)
--- a/
article.tex
+++ b/
article.tex
@@
-815,7
+815,7
@@
dependency.
L \nothaspatch \pry
}\]
\[ \eqn{ Insertion Acyclic }{
L \nothaspatch \pry
}\]
\[ \eqn{ Insertion Acyclic }{
- R^+ \nothaspatch \pq
y
+ R^+ \nothaspatch \pq
}\]
\subsection{No Replay}
}\]
\subsection{No Replay}
@@
-840,8
+840,16
@@
By $\merge$, $D \isin L \lor D \isin R^+ \lor D = C$.
For $D \isin L$, Base Acyclic for L suffices. For $D \isin R^+$,
Insertion Acyclic suffices. For $D = C$, trivial. $\qed$.
For $D \isin L$, Base Acyclic for L suffices. For $D \isin R^+$,
Insertion Acyclic suffices. For $D = C$, trivial. $\qed$.
+\subsection{Coherence}
+
+We consider some $D \in \py$.
+
+\subsubsection{For $\p = \pq$:}
+
xxx up to here
xxx up to here
+$D \not\isin L$, $D \not\isin $
+
\section{Merge}
Merge commits $L$ and $R$ using merge base $M$:
\section{Merge}
Merge commits $L$ and $R$ using merge base $M$: