From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 14 Mar 2012 18:37:49 +0000 (+0000)
Subject: wip dependency insertion
X-Git-Tag: f0.2~31
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=d357159ce17651ed7deba459e32400636973b827

wip dependency insertion
---

diff --git a/article.tex b/article.tex
index 6be7a68..0615616 100644
--- a/article.tex
+++ b/article.tex
@@ -815,7 +815,7 @@ dependency.
  L \nothaspatch \pry
 }\]
 \[ \eqn{ Insertion Acyclic }{
- R^+ \nothaspatch \pqy
+ R^+ \nothaspatch \pq
 }\]
 
 \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$.
 
+\subsection{Coherence}
+
+We consider some $D \in \py$.
+
+\subsubsection{For $\p = \pq$:}
+
 xxx up to here
 
+$D \not\isin L$, $D \not\isin $
+
 \section{Merge}
 
 Merge commits $L$ and $R$ using merge base $M$: