From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 26 Feb 2012 00:41:51 +0000 (+0000)
Subject: fix a few bugs in THEORY
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke.git;a=commitdiff_plain;h=HEAD

fix a few bugs in THEORY
---

diff --git a/THEORY b/THEORY
index 4478fa0..13c20af 100644
--- a/THEORY
+++ b/THEORY
@@ -3,11 +3,12 @@ GENERAL
  C >= D			C is descendant of D, partial order
  D \isin C		C contains changes from D, partial order
  Patch P has two sets P+, P-
- Ancestors A(C,P) = { Ca \elem C | Ca \elem P }
- Ends E(C,P) = maximal elements of A(C,P)
+ Ancestors A(C,P) = { Ca \elem P | Ca <= C }
+ Ends E(C,P) = <=-maximal elements of A(C,P)
  Patch inclusion
    C \haspatch P    <=> [ \forall D \elem P+: D \isin C <=> D <= C ]
    C \nothaspatch P <=> [ \forall D \elem P+: D \notisin C ]
+   and we maintain C \haspatch P v C \nothaspatch P
 
 COMMIT ANNOTATIONS