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