From ebe387b14666a698e6cefd8ac58fcb47d1bd9fe7 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 25 Apr 2012 22:14:11 +0100 Subject: [PATCH] strategy: wip --- strategy.tex | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/strategy.tex b/strategy.tex index ca31c32..3760941 100644 --- a/strategy.tex +++ b/strategy.tex @@ -8,6 +8,7 @@ We start with some commits $S_0 \ldots S_n$ Invoke Plan $\patchof \pl$ where the algorithm Plan $\pc$ is as follows: + Notation: $\pc \succ_1 \{ \p, \pq \ldots \}$ @@ -18,6 +19,7 @@ Notation: $\py \succ \pq$ + We intend to merge all $\set E_{\pc} = \{ E_{\pc,j \ldots} \}$ and all the direct contributors of $\pc$ (as determined below) into the existing git ref for $\pc$, to make $T_{\pc}$. @@ -39,7 +41,7 @@ Initially let $T_{\pc,0}$ be the git ref for $\pcn$. And let $\set D_0 = \depsreqof{T_{\pc,0}}$. For each $E_j$ starting with $j=1$ choose a corresponding intended merge base $M_j$ such that $M_j \le E_j \land M_j \le T_{\pc,j-1}$. -Calculate $D_j$ as the 3-way merge of the sets $D_{j-1}$ and +Calculate $\set D_j$ as the 3-way merge of the sets $\set D_{j-1}$ and $\depsreqof{E_j}$ using as a base $\depsreqof{M_j}$. This will generate $D_m$ as the putative direct contributors for $\pcn$. -- 2.30.2