From fc96ba0c73d771839a025fc5cb771554cf178eaa Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 14 Mar 2012 18:27:25 +0000 Subject: [PATCH] wip dependency insertion --- article.tex | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/article.tex b/article.tex index e1d4712..ac2a99e 100644 --- a/article.tex +++ b/article.tex @@ -789,6 +789,37 @@ $\qed$ Not applicable. +\section{Dependency Insertion} + +Given $L$ construct $C$ which additionally +contains $\pr$ as represented by $R^+$ and $R^-$. +This may even be used for reintroducing a previous-removed branch +dependency. +\gathbegin + C \hasparents \{ L, R^+ \} +\gathnext + \patchof{C} = \patchof{L} +\gathnext + \mergeof{C}{L}{R^-}{R^+} +\end{gather} + +\subsection{Conditions} + +\[ \eqn{ Ingredients }{ + R^- = \baseof{R^+} +}\] +\[ \eqn{ Into Base }{ + L \in \pqn +}\] +\[ \eqn{ Currently Excluded }{ + L \nothaspatch \pry +}\] +\[ \eqn{ Insertion Acyclic }{ + R^+ \nothaspatch \pqy +}\] + +xxx up to here + \section{Merge} Merge commits $L$ and $R$ using merge base $M$: -- 2.30.2