From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 27 Mar 2012 18:14:08 +0000 (+0100)
Subject: comments from mdw - clarify that \p are disjoint by construction
X-Git-Tag: f0.3~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=891ae7626916bde1eb7dfa38762bbb4d94b85211;hp=3a8cce8e2c30335e973bcaa8b98a7d8238bdaacb

comments from mdw - clarify that \p are disjoint by construction
---

diff --git a/invariants.tex b/invariants.tex
index ab03491..20d6e76 100644
--- a/invariants.tex
+++ b/invariants.tex
@@ -26,6 +26,10 @@ We maintain these each time we construct a new commit. \\
     D \le C \implies \patchof{D} = \bot
 }\]
 
+We also assign each new commit $C$ to zero or one of the sets $\p$, as
+stated in the definition of $\patchof{C}$ in the summary for each kind
+of commit.
+
 A commit $C$ which satisfies all of the above is said to be
 ``conformant''.
 
diff --git a/notation.tex b/notation.tex
index 413305f..966c51e 100644
--- a/notation.tex
+++ b/notation.tex
@@ -27,7 +27,8 @@ A patch $\p$ consists of two sets of commits $\pn$ and $\py$, which
 are respectively the base and tip git branches.  $\p$ may be used
 where the context requires a set, in which case the statement
 is to be taken as applying to both $\py$ and $\pn$.
-All of these sets are disjoint.  Hence:
+All of these sets will be disjoint by construction
+(see Invariants, below).  Hence:
 
 \item[ $ \patchof{ C } $ ]
 Either $\p$ s.t. $ C \in \p $, or $\bot$.