From 1768ad396360b5f7145450858b4bae1e9d1c7b05 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 10 Aug 2013 15:58:48 +0100 Subject: [PATCH] strategy: Define H in notation --- strategy.tex | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/strategy.tex b/strategy.tex index a4716b3..e2017c3 100644 --- a/strategy.tex +++ b/strategy.tex @@ -54,6 +54,13 @@ $\bigforall_{E \in \pendsof{\set X}{\p}} E \le T$ $\bigcup_{\p \in \allpatches} \set H^{\pn} \cup \set H^{\py}$. All the input commits to the update algorithm. (See below.) +\item[ $\set H^{\pc^{_=/-}}$ ] + +The existing head commit(s) $\set H$ of the branch $\pc^{+/-}$. +These are the heads which will be merged and used in this update. +This will include the current local and remote git refs, as desired. +Obtained from the function $h$ (see below). + %\item[ $\set E_{\pc}$ ] %$ \bigcup_i \pendsof{S_{\pc,i}}{\pc} $. %All the ends of $\pc$ in the sources. @@ -76,8 +83,6 @@ all of its dependencies will be updated. \item[ $h : \pc^{+/-} \mapsto \set H^{\pc^{+/-}}$ ] Function for getting the existing heads $\set H$ of the branch $\pc^{+/-}$. -These are the heads which will be merged and used in this update. -This will include the current local and remote git refs, as desired. \item[ $g : \pc, \Gamma \mapsto \Gamma'$ ] Function to allow explicit adjustment of the direct dependencies -- 2.30.2