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:
b1f1783
)
strategy: wip
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 26 Apr 2012 00:04:53 +0000
(
01:04
+0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 26 Apr 2012 00:04:53 +0000
(
01:04
+0100)
strategy.tex
patch
|
blob
|
history
diff --git
a/strategy.tex
b/strategy.tex
index 8c87f918141929d2c4bf36ff28ebc32b14a19ffe..50efed7c8598cbf61a0e9b349b9dece2e3634267 100644
(file)
--- a/
strategy.tex
+++ b/
strategy.tex
@@
-1,12
+1,10
@@
\section{Strategy}
When we are trying to do a merge of some kind, in general,
\section{Strategy}
When we are trying to do a merge of some kind, in general,
-we want to merge some commits $S_0 \ldots S_n$.
+we want to merge some
source
commits $S_0 \ldots S_n$.
We'll write $S_0 = L$. We require that $L$ is the current git ref
for $\patchof{L}$.
We'll write $S_0 = L$. We require that $L$ is the current git ref
for $\patchof{L}$.
-%Let $\set E_{\pc} = \bigcup_i \pendsof{S_i}{\pc}$.
-
\subsection{Notation}
\begin{basedescript}{
\subsection{Notation}
\begin{basedescript}{
@@
-27,6
+25,10
@@
set $\pq$.
This is an acyclic relation, and is the completion of $\succ_1$ into a
partial order.
This is an acyclic relation, and is the completion of $\succ_1$ into a
partial order.
+\item[ $\set E_{\pc}$ ]
+$ \bigcup_i \pendsof{S_i}{\pc} $.
+All the ends of $\pc$ in the sources.
+
\end{basedescript}
\subsection{Planning phase}
\end{basedescript}
\subsection{Planning phase}
@@
-47,8
+49,6
@@
The sole direct contributor of $\pcy$ is $\pcn$.
\subsubsection{Planning step for $\pc = \pcn$.}
\subsubsection{Planning step for $\pc = \pcn$.}
-FIXME DEFINE $\set E$
-
Choose an (arbitrary, but ideally somehow optimal in
a way not discussed here) ordering of $\set E_{\pc}$, $E_j$ (for
$j = 1 \ldots m$). Remove from that set (and ordering) any $E_j$ which
Choose an (arbitrary, but ideally somehow optimal in
a way not discussed here) ordering of $\set E_{\pc}$, $E_j$ (for
$j = 1 \ldots m$). Remove from that set (and ordering) any $E_j$ which