From: Ian Jackson Date: Sat, 9 Jun 2012 15:25:39 +0000 (+0100) Subject: strategy: amendments from p27-28 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=fd9a2351715889769471bff44793f5333c2c7250 strategy: amendments from p27-28 --- diff --git a/trav-alg.tex b/trav-alg.tex index 4b6796a..3151ca4 100644 --- a/trav-alg.tex +++ b/trav-alg.tex @@ -1,7 +1,7 @@ \section{Traversal phase --- algorithm} (In general, unless stated otherwise below, when we generate a new -commit $C$ using one of the commit kind algorith, we update +commit $C$ using one of the commit kind recipies, we update $W \assign C$. In any such case where we say we're going to Merge with $L = W$, if $R \ge W$ we do not Merge but instead simply set $W \assign R$.) @@ -29,12 +29,15 @@ such that: \statement{Correct Base}{ \baseof{\tipcy} = \tipcn } -\statement{Base Ends Supreme}{ - \tipcn \ge \pendsof{\allsrcs}{\pcn} -} -\statement{Tip Ends Supreme}{ +\statement{Tip Exceeds Inputs}{ \tipcy \ge \pendsof{\allsrcs}{\pcy} } +\statement{Base Exceeds Inputs' Bases}{ + \bigforall_{E \in \pendsof{\allsrcs}{\pcy}} \tipcn \ge \baseof{E} +} +\statement{Base Exceeds Base Inputs}{ + \bigforall_{H \in \set H^{\pn}} \tipcn \ge H +} \subsection{$\alg{Merge-Base}(\pc)$} @@ -99,7 +102,7 @@ Execute the subalgorithm $\alg{Recreate-Recurse}(\pc)$. \item Declare that we contain all of the relevant information from the -sources. That is, use $\alg{Pseudo-merge}$ with $L = W, \; +sources. That is, use$\alg{Pseudo-Merge}$with$L = W, \; \set R = \{ W \} \cup \set S^{\pcn}$. (Recreate Base Final Declaration.) @@ -113,12 +116,12 @@ sources. That is, use$\alg{Pseudo-merge}$with$L = W, \; \item TODO what about non-Topbloke base branches -\item Use $\alg{Pseudo-Merge}$ with $L = W,\; \set R = \{ \tipdn \}$. -(Recreate Base Dependency Base Declaration.) - \item For all $\hasdep$-maximal $\pd' \isdirdep \pd$, execute $\alg{Recreate-Recurse}(\pd')$. +\item Use $\alg{Pseudo-Merge}$ with $L = W,\; \set R = \{ \tipdn \}$. +(Recreate Base Dependency Base Declaration.) + \item Use $\alg{Merge}$ to apply $\pd$ to $W$. That is, $L = W, \; R = \tipdy, \; M = \baseof{R} = \tipdn$. (Recreate Reapply.)