be more rigorous about conformance

diff --git a/invariants.tex b/invariants.tex
index 25d51c508c167005c48d7642108e961785aa1258..ab0349110d651d3e1109c5723bdd874f103c1de3 100644 (file)
--- a/invariants.tex
+++ b/invariants.tex
@@ -13,7 +13,7 @@ We maintain these each time we construct a new commit. \\
       (D \in \py \land D \le C) }
 }\]
 \[\eqn{Base Acyclic:}{
-  \bigforall_{B \in \pn} D \isin B \implies D \notin \py
+  \bigforall_{C \in \pn} D \isin C \implies D \notin \py
 }\]
 \[\eqn{Coherence:}{
   \bigforall_{C,\p} C \haspatch \p \lor C \nothaspatch \p
@@ -25,3 +25,10 @@ We maintain these each time we construct a new commit. \\
   \bigforall_{C \text{ s.t. } \patchof{C} = \bot}
     D \le C \implies \patchof{D} = \bot
 }\]
+
+A commit $C$ which satisfies all of the above is said to be
+``conformant''.
+
+For each operation we will perform which generates a new commit, we
+will assume the conformance of the existing history and prove the
+conformance of the new commit.

diff --git a/lemmas.tex b/lemmas.tex
index aeb656479c497363460d14de95af921d326ccd58..7d72e543db6d40a9e8e59d8b03989a2007500e08 100644 (file)
--- a/lemmas.tex
+++ b/lemmas.tex
@@ -54,7 +54,7 @@ So by Base Acyclic $D \isin B \implies D \notin \py$.
 }\]
 
 \subsection{Tip Self Inpatch}
-Given Exclusive Tip Contents and Base Acyclic for $C$,
+Given Base Acyclic for $C$,
 $$
   \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}
+Given conformant commits $A \in \set A$,
 $$
   \left[
     {C \hasparents \set A} \land
@@ -142,12 +143,13 @@ $$
 $$
 \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}
+Given a conformant commit $L$,
 $$
   \left[
     C \hasparents \{ L \}
@@ -169,6 +171,7 @@ So $D \isin C \equiv D \le C$.
 }
 
 \subsection{Totally Foreign Contents}
+Given conformant commits $A \in \set A$,
 $$
    \left[
     C \hasparents \set A \land