From 51dabd467724221f7dc2c442ef1e46a330ac7c5c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 27 Apr 2012 14:31:25 +0100 Subject: [PATCH] strategy: wip --- strategy.tex | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/strategy.tex b/strategy.tex index 0ac03fa..e0b1266 100644 --- a/strategy.tex +++ b/strategy.tex @@ -115,7 +115,7 @@ After we are done, the result has the following properties: \tipfc \haspatch \p \equiv \pc \hasdep \py }\] -For brevity we will write $\tipu$ for $\tipuc$, etc. We will start +For brevity we will sometimes write $\tipu$ for $\tipuc$, etc. We will start out with $\tipc = \tipz$, and at each step of the way construct some $\tipu$ from $\tipc$. The final $\tipu$ becomes $\tipf$. @@ -126,6 +126,18 @@ it is, are we fast forward to $E_i$ --- formally, $\tipu = \text{max}(\tipc, E_i)$ --- and drop $E_i$ from the planned ordering. +Then we will merge the direct contributors and the sources' ends. + +This generates more commits $\tipuc \in \pc$, but none in any other +commit set. We maintain XXX FIXME IS THIS THE BEST THING? +$$ + \bigforall_{\p \isdep \pc} + \pancsof{\tipcc}{\p} \subset \left[ + \tipfa \p \cup + \bigcup_{E \in \set E_{\pc}} \pancsof{E}{\p} + \right] +$$ + \subsection{Merge Contributors for $\pcy$} Merge $\pcn$ into $\tipc$. That is, merge with @@ -147,7 +159,11 @@ WIP UP TO HERE Addition Merge Ends: If $\py \isdep \pcn$, we have already done the execution phase for $\pcn$ and $\py$. By -Perfect Contents for $\pcn$, $\tipfa \pcn \haspatch \p$. +Perfect Contents for $\pcn$, $\tipfa \pcn \haspatch \p$ i.e. +$R \haspatch \p$. So we only need to worry about $Y = R = \tipfa \pcn$. +By Tip Dependencies $\tipfa \pcn \ge \tipfa \py$. +And by Tip Inputs $\tipfa \py \ge $ + computed $\tipfa \py$, and by Perfect Contents for $\py$ -- 2.30.2