X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=blobdiff_plain;f=annotations.tex;h=b4e86dab19b0648af7998e233209b520e0b7011c;hp=3401475b5ebb302312f4949641403363fa69a5e9;hb=bf00a6804e4075d8639f69c96aabf4150506329c;hpb=5860d628a539a0cf1b5d2f540d715291261ec2c0 diff --git a/annotations.tex b/annotations.tex index 3401475..b4e86da 100644 --- a/annotations.tex +++ b/annotations.tex @@ -10,6 +10,8 @@ We annotate each Topbloke commit $C$ with: \text{ either } C \haspatch \p \text{ or } C \nothaspatch \p \gathnext \bigforall_{\py \not\ni C} \pendsof{C}{\py} +\gathnext + \pendsof{C}{\foreign} \end{gather} $\patchof{C}$, for each kind of Topbloke-generated commit, is stated @@ -27,10 +29,11 @@ is in stated for the ingredients $I$) in the proof of Coherence for each kind of commit. -$\pendsof{C}{\py}$ is computed, for all Topbloke-generated commits, +$\pendsof{C}{\py}$ and $\pendsof{C}{\foreign}$ +are computed, for all Topbloke-generated commits, using the lemma Calculation of Ends, above. -We do not annotate $\pendsof{C}{\pay{C}}$ for $C \in \pay{C}$. Doing so would +We do not annotate $\pendsof{C}{\set S}$ for $C \in \set S$. Doing so would make it wrong to make plain commits with git because the recorded $\pends$ would have to be updated. The annotation is not needed in that case -because $\forall_{\pay{C} \ni C} \; \pendsof{C}{\pay{C}} = \{C\}$. +because $\forall_{\set S \ni C} \; \pendsof{C}{\set S} = \{C\}$.