chiark / gitweb /
wip dependency insertion
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 14 Mar 2012 18:27:25 +0000 (18:27 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 14 Mar 2012 18:27:25 +0000 (18:27 +0000)
article.tex

index e1d4712..ac2a99e 100644 (file)
@@ -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$: