From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 16 Mar 2012 23:39:37 +0000 (+0000)
Subject: non-topbloke merges fix merge ends proof
X-Git-Tag: f0.2~3
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=b3def3247de20137e8b637c8ad8a2f8e266c0751;p=topbloke-formulae.git

non-topbloke merges fix merge ends proof
---

diff --git a/merge.tex b/merge.tex
index e386ada..5be4479 100644
--- a/merge.tex
+++ b/merge.tex
@@ -59,10 +59,12 @@ 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.
-And by Foreign Contents for (wlog) Y, $\forall_{\p, D \in \py} D \not\le Y$
-so then by No Replay $D \not\isin Y$
-so $\neg [ Y \haspatch \p ]$ so neither
-Merge Ends condition applies.
+By Foreign Contents of $L$, $\patchof{M} = \bot$ as well.
+So by Foreign Contents for any $A \in \{L,M,R\}$,
+$\forall_{\p, D \in \py} D \not\le A$
+so by No Replay for A $D \not\isin A$.
+Thus $\pendsof{A}{\py} = \{ \}$ and the RHS of both Merge Ends
+conditions are satisifed.
 
 So a plain git merge of non-Topbloke branches meets the conditions and
 is therefore consistent with our model.