chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9309c8e
)
strategy: wip
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 27 Apr 2012 13:31:25 +0000
(14:31 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 27 Apr 2012 13:31:25 +0000
(14:31 +0100)
strategy.tex
patch
|
blob
|
history
diff --git
a/strategy.tex
b/strategy.tex
index 0ac03fa119ebb0a65c201352c9c8123136bc4a8e..e0b126657816909da6179b1a86cb118cb1c9c63f 100644
(file)
--- 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
}\]
\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$.
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.
--- 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
\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
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$
computed $\tipfa \py$, and by Perfect Contents for $\py$