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:
c2932ba
)
Foreign Contents section in a couple of places
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 11 Mar 2012 17:35:13 +0000
(17:35 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 11 Mar 2012 17:35:13 +0000
(17:35 +0000)
article.tex
patch
|
blob
|
history
diff --git
a/article.tex
b/article.tex
index 7630745d41eaf60ca7369bd99e7ec29ea03cbe98..3d8bd8179a5f26dc787fa70a4de9046f32709f6d 100644
(file)
--- a/
article.tex
+++ b/
article.tex
@@
-459,6
+459,13
@@
$\qed$
If $D = C$, trivial. For $D \neq C$:
$D \isin C \equiv D \isin A \equiv D \le A \equiv D \le C$. $\qed$
If $D = C$, trivial. For $D \neq C$:
$D \isin C \equiv D \isin A \equiv D \le A \equiv D \le C$. $\qed$
+\subsection{Foreign Contents:}
+
+Only relevant if $\patchof{C} = \bot$. Trivial by Foreign Contents of
+$A$. $\qed$
+
+xxx fixme not trivial use Totally Foreign Contents
+
\section{Create Base}
Given $L$, create a Topbloke base branch initial commit $B$.
\section{Create Base}
Given $L$, create a Topbloke base branch initial commit $B$.
@@
-628,6
+635,10
@@
Thus $D \isin C \equiv D \le C$.
$\qed$
$\qed$
+\subsection{Foreign Contents:}
+
+Not applicable. $\qed$
+
\section{Merge}
Merge commits $L$ and $R$ using merge base $M$:
\section{Merge}
Merge commits $L$ and $R$ using merge base $M$:
@@
-888,4
+899,11
@@
OK
$\qed$
$\qed$
+\subsection{Foreign Contents:}
+
+xxx use Totally Foreign Contents
+
+If $\patchof{C} = \bot$, by Foreign Merges
+$\patchof{L} = \patchof{R} = \bot$.
+
\end{document}
\end{document}