wip dependency insertion

[topbloke-formulae.git] / article.tex

diff --git a/article.tex b/article.tex
index 4af8e0531ea2a659c79755b407b8e6ae7f772a49..ac2a99ed41eca78debab5d0cf759c11a5a373bac 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -657,10 +657,11 @@ Simple Foreign Inclusion applies.  $\qed$
 
 Not applicable.
 
-\section{Anticommit}
+\section{Dependency Removal}
 
 Given $L$ which contains $\pr$ as represented by $R^+, R^-$.
-Construct $C$ which has $\pr$ removed.
+Construct $C$ which has $\pr$ removed by applying a single
+commit which is the anticommit of $\pr$.
 Used for removing a branch dependency.
 \gathbegin
  C \hasparents \{ L \}
@@ -788,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$: