strategy: notation: change D(K) to G(K)

[topbloke-formulae.git] / merge.tex

diff --git a/merge.tex b/merge.tex
index 45b7f66f0cbddd4eeedba8446a19ee11ebb5bf16..44850a5e9ca19ac30ae570bc90149e788707dac7 100644 (file)
--- a/merge.tex
+++ b/merge.tex
@@ -10,8 +10,9 @@ Merge commits $L$ and $R$ using merge base $M$:
 \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 }{
@@ -46,11 +47,12 @@ $L \in \pn$, $R \in \pry$, $M = \baseof{R}$.
     \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 }{