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 (from parent 1:
c132ec1
)
wip anticommit foreign inclusion
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 11 Mar 2012 12:44:56 +0000
(12:44 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 11 Mar 2012 12:44:56 +0000
(12:44 +0000)
article.tex
patch
|
blob
|
history
diff --git
a/article.tex
b/article.tex
index b7df641e68703266c1729e1c3abf32680e35f805..77a1098b1680f4b38d19963ff50891c8384808b2 100644
(file)
--- a/
article.tex
+++ b/
article.tex
@@
-520,6
+520,21
@@
So $L \nothaspatch \p \implies C \nothaspatch \p$.
Whereas if $L \haspatch \p$, $D \isin L \equiv D \le L$.
so $L \haspatch \p \implies C \haspatch \p$.
Whereas if $L \haspatch \p$, $D \isin L \equiv D \le L$.
so $L \haspatch \p \implies C \haspatch \p$.
+\section{Foreign Inclusion}
+
+Consider some $D$ s.t. $\patchof{D} = \bot$. $D \neq C$.
+So by Desired Contents $D \isin C \equiv D \isin L$.
+By Foreign Inclusion of $D$ in $L$, $D \isin L \equiv D \le L$.
+So $D \isin C \equiv D \le L$.
+
+xxx up to here
+
+By Tip Contents of $R^+$, $D \isin R^+ \equiv D \isin \baseof{R^+}$
+i.e. $\equiv D \isin R^-$.
+So by $\merge$, $D \isin C \equiv D \isin L$.
+
+Thus $D \isin C \equiv $
+
\section{Merge}
Merge commits $L$ and $R$ using merge base $M$ ($M < L, M < R$):
\section{Merge}
Merge commits $L$ and $R$ using merge base $M$ ($M < L, M < R$):