From c1a7842aff8780cc79535f08287aa95bdeba20a7 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 28 May 2012 00:08:18 +0100 Subject: [PATCH] foreign notation: make \foreign into a set --- article.tex | 4 ++-- notation.tex | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/article.tex b/article.tex index 67f7890..6e3d515 100644 --- 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 bae94bb..48ea1b7 100644 --- 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. -- 2.30.2