\end{gather}
We will occasionally use $X,Y$ s.t. $\{X,Y\} = \{L,R\}$.
-This can also be used for dependency re-insertion, by setting
-$L \in \pn$, $R \in \pry$, $M = \baseof{R}$.
+This can also be used for dependency re-insertion, by setting $L \in
+\pn$, $R \in \pry$, $M = \baseof{R}$, provided that the Conditions are
+satisfied; in particular, provided that $L \ge \baseof{R}$.
\subsection{Conditions}
\[ \eqn{ Ingredients }{
\bigforall_{E \in \pendsof{X}{\py}} E \le Y
\right]
}\]
-\[ \eqn{ Suitable Tip }{
+\[ \eqn{ Suitable Tips }{
+ \bigforall_{\p \neq \patchof{L}, \; C \haspatch \p}
\bigexists_T
- \pendsof{J}{\p} = \{ T \}
+ \pendsof{J}{\py} = \{ T \}
\land
- \forall_{E \in \pendsof{K}{\p}} T \ge E
+ \forall_{E \in \pendsof{K}{\py}} T \ge E
, \text{where} \{J,K\} = \{L,R\}
}\]
\[ \eqn{ Foreign Merges }{
- \patchof{L} = \bot \implies \patchof{R} = \bot
+ \isforeign{L} \implies \isforeign{R}
}\]
\subsection{Non-Topbloke merges}
-We require both $\patchof{L} = \bot$ and $\patchof{R} = \bot$
+We require both $\isforeign{L}$ and $\isforeign{R}$
(Foreign Merges, above).
I.e. not only is it forbidden to merge into a Topbloke-controlled
branch without Topbloke's assistance, it is also forbidden to
merge any Topbloke-controlled branch into any plain git branch.
Given those conditions, Tip Merge and Merge Acyclic do not apply.
-By Foreign Contents of $L$, $\patchof{M} = \bot$ as well.
+By Foreign Contents of $L$, $\isforeign{M}$ as well.
So by Foreign Contents for any $A \in \{L,M,R\}$,
$\forall_{\p, D \in \py} D \not\le A$
so $\pendsof{A}{\py} = \{ \}$ and the RHS of both Merge Ends
suitable.
For $L \not\in \py$, $\pancsof{C}{\py} = \pancsof{L}{\py} \cup
-\pancsof{R}{\py}$. So $T$ from Suitable Tip is a suitable $T$ for
+\pancsof{R}{\py}$. So $T$ from Suitable Tips is a suitable $T$ for
Unique Tips.
$\qed$
\subsection{Foreign Inclusion}
-Consider some $D$ s.t. $\patchof{D} = \bot$.
+Consider some $D \in \foreign$.
By Foreign Inclusion of $L, M, R$:
$D \isin L \equiv D \le L$;
$D \isin M \equiv D \le M$;
\subsection{Foreign Contents}
-Only relevant if $\patchof{L} = \bot$, in which case
-$\patchof{C} = \bot$ and by Foreign Merges $\patchof{R} = \bot$,
+Only relevant if $\isforeign{L}$, in which case
+$\isforeign{C}$ and by Foreign Merges $\isforeign{R}$,
so Totally Foreign Contents applies. $\qed$