X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=blobdiff_plain;f=merge.tex;h=746ba2d6f6dead05b0e72c95cc1fef058365a505;hp=9daaa00450ae562db1d3af581b856e08de0e4af0;hb=13bb63711973608b167a8624d32e5323b866bbe6;hpb=547f81711b274591ce075b8df2c3e41c6394eb93

diff --git a/merge.tex b/merge.tex
index 9daaa00..746ba2d 100644
--- a/merge.tex
+++ b/merge.tex
@@ -1,4 +1,5 @@
 \section{Merge}
+\label{commit-merge}
 
 Merge commits $L$ and $R$ using merge base $M$:
 \gathbegin
@@ -27,6 +28,16 @@ satisfied; in particular, provided that $L \ge \baseof{R}$.
       \text{otherwise} : & \false
    \end{cases}
 }\]
+\[ \eqn{ Base Merge }{
+ L \in \pn \implies
+  \big[
+   R \in \pn
+     \lor
+   R \in \foreign
+     \lor
+   ( R \in \pqy \land \pq \neq \p )
+  \big]
+}\]
 \[ \eqn{ Merge Acyclic }{
     L \in \pn
    \implies
@@ -48,28 +59,28 @@ satisfied; in particular, provided that $L \ge \baseof{R}$.
    \right]
 }\]
 \[ \eqn{ Suitable Tips }{
-    \bigforall_{\p \neq \patchof{L}, \; C \haspatch \p}
+    \bigforall_{\p \patchisin C, \; \py \neq \patchof{L}}
     \bigexists_T
       \pendsof{J}{\py} = \{ T \}
      \land
       \forall_{E \in \pendsof{K}{\py}} T \ge E
     , \text{where} \{J,K\} = \{L,R\}
 }\]
-\[ \eqn{ Foreign Merges }{
+\[ \eqn{ Foreign Merge }{
     \isforeign{L} \implies \isforeign{R}
 }\]
 
 \subsection{Non-Topbloke merges}
 
 We require both $\isforeign{L}$ and $\isforeign{R}$
-(Foreign Merges, above).
+(Foreign Merge, 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$, $\isforeign{M}$ as well.
-So by Foreign Contents for any $A \in \{L,M,R\}$,
+By Foreign Ancestry of $L$, $\isforeign{M}$ as well.
+So by Foreign Ancestry 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
 conditions are satisifed.
@@ -309,8 +320,29 @@ OK
 
 $\qed$
 
-\subsection{Foreign Contents}
+\subsection{Foreign Ancestry}
 
 Only relevant if $\isforeign{L}$, in which case
-$\isforeign{C}$ and by Foreign Merges $\isforeign{R}$,
-so Totally Foreign Contents applies.  $\qed$
+$\isforeign{C}$ and by Foreign Merge $\isforeign{R}$,
+so Totally Foreign Ancestry applies.  $\qed$
+
+\subsection{Bases' Children}
+
+If $L \in \py, R \in \py$: not applicable for either $D=L$ or $D=R$.
+
+If $L \in \py, R \in \pn$: not applicable for $L$, OK for $R$.
+
+Other possibilities for $L \in \py$ are excluded by Tip Merge.
+
+If $L \in \pn, R \in \pn$: satisfied for both $L$ and $R$.
+
+If $L \in \pn, R \in \foreign$: satisfied for $L$, not applicable for
+$R$.
+
+If $L \in \pn, R \in \pqy$: satisfied for $L$, not applicable for
+$R$.
+
+Other possibilities for $L \in \pn$ are excluded by Base Merge.
+
+If $L \in \foreign$: not applicable for $L$; nor for $R$, by Foreign Merge.
+