foreign notation: make \foreign into a set

diff --git a/article.tex b/article.tex
index 67f78900141398a04b4c7aca9dddec33c53190c7..6e3d5156600c4be6dbe41cd6de0a272aee783f54 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -96,8 +96,8 @@
 \newcommand{\baseof}[1]{\base ( #1 ) }
 \newcommand{\depsreqof}[1]{\depsreq ( #1 ) }
 
-\newcommand{\foreign}{\bot}
-\newcommand{\isforeign}[1]{\patchof{#1} = \foreign}
+\newcommand{\foreign}{\pa F}
+\newcommand{\isforeign}[1]{#1 \in \foreign}
 
 \newcommand{\allpatches}{\Upsilon}
 \newcommand{\assign}{\leftarrow}

diff --git a/notation.tex b/notation.tex
index bae94bbafa3534d093f2846ddcb005855340b893..48ea1b7e2ceec9002f67b2d41335e5c227b69f25 100644 (file)
--- a/notation.tex
+++ b/notation.tex
@@ -33,6 +33,10 @@ is to be taken as applying to both $\py$ and $\pn$.
 All of these sets will be disjoint by construction
 (see Invariants, below).  Hence:
 
+\item[ $\foreign$ ]
+The set of all commits which are not part of a Topbloke branch.  We
+call these foreign commits.
+
 \item[ $\set A$, $\set P$, $\ldots$ ]
 Arbitrary sets of commits.  Maybe $\set P = \p$ i.e.\ some $\py$ or $\pn$, but
 maybe not.