chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c267cca
)
fix non-topbloke merges empty ends proof
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 18 Mar 2012 10:55:40 +0000
(10:55 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 18 Mar 2012 10:55:40 +0000
(10:55 +0000)
merge.tex
patch
|
blob
|
history
diff --git
a/merge.tex
b/merge.tex
index 2403a49f85ad40bb07e0d502e2057b3fad0175c6..d9415bcb88e5c7fbd8d0a244763f079c1348695d 100644
(file)
--- a/
merge.tex
+++ b/
merge.tex
@@
-62,8
+62,7
@@
Given those conditions, Tip Merge and Merge Acyclic do not apply.
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$
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
+so $\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
conditions are satisifed.
So a plain git merge of non-Topbloke branches meets the conditions and