pseudomerge: Bases' Children

[topbloke-formulae.git] / invariants.tex

diff --git a/invariants.tex b/invariants.tex
index 736fb8ee569ed5a2791bfae5b1c817cd95cfaa23..28647658cb30190e30a2f93a658757a81f8ddf59 100644 (file)
--- a/invariants.tex
+++ b/invariants.tex
@@ -22,11 +22,16 @@ We maintain these each time we construct a new commit. \\
   \bigforall_{C,\p} C \haspatch \p \implies \pendsof{C}{\py} = \{ T \}
 }\]
 \[\eqn{Foreign Inclusion}{
-  \bigforall_{D \text{ s.t. } \patchof{D} = \foreign} D \isin C \equiv D \leq C
+  \bigforall_{D \in \foreign} D \isin C \equiv D \leq C
 }\]
 \[\eqn{Foreign Contents}{
-  \bigforall_{C \text{ s.t. } \patchof{C} = \foreign}
-    D \le C \implies \patchof{D} = \foreign
+  \bigforall_{C \in \foreign}
+    D \le C \implies \isforeign{D}
+}\]
+\[\eqn{Bases' Children}{
+  C \hasparent D \land D \in \pdn
+    \implies
+  C \in \pdn \lor C \in \pdy
 }\]
 
 We also assign each new commit $C$ to zero or one of the sets $\p$, as