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:
01bce0e
)
merge: rename Foreign Merge (was Foreign Merges)
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 10 Aug 2013 19:07:35 +0000
(20:07 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 10 Aug 2013 19:07:35 +0000
(20:07 +0100)
merge.tex
patch
|
blob
|
history
diff --git
a/merge.tex
b/merge.tex
index 77b67881998e9f7abf30298e8e906cfd0877b28c..746ba2d6f6dead05b0e72c95cc1fef058365a505 100644
(file)
--- a/
merge.tex
+++ b/
merge.tex
@@
-66,14
+66,14
@@
satisfied; in particular, provided that $L \ge \baseof{R}$.
\forall_{E \in \pendsof{K}{\py}} T \ge E
, \text{where} \{J,K\} = \{L,R\}
}\]
\forall_{E \in \pendsof{K}{\py}} T \ge E
, \text{where} \{J,K\} = \{L,R\}
}\]
-\[ \eqn{ Foreign Merge
s
}{
+\[ \eqn{ Foreign Merge }{
\isforeign{L} \implies \isforeign{R}
}\]
\subsection{Non-Topbloke merges}
We require both $\isforeign{L}$ and $\isforeign{R}$
\isforeign{L} \implies \isforeign{R}
}\]
\subsection{Non-Topbloke merges}
We require both $\isforeign{L}$ and $\isforeign{R}$
-(Foreign Merge
s
, 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.
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.
@@
-323,7
+323,7
@@
$\qed$
\subsection{Foreign Ancestry}
Only relevant if $\isforeign{L}$, in which case
\subsection{Foreign Ancestry}
Only relevant if $\isforeign{L}$, in which case
-$\isforeign{C}$ and by Foreign Merge
s
$\isforeign{R}$,
+$\isforeign{C}$ and by Foreign Merge $\isforeign{R}$,
so Totally Foreign Ancestry applies. $\qed$
\subsection{Bases' Children}
so Totally Foreign Ancestry applies. $\qed$
\subsection{Bases' Children}
@@
-344,5
+344,5
@@
$R$.
Other possibilities for $L \in \pn$ are excluded by Base Merge.
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
s
.
+If $L \in \foreign$: not applicable for $L$; nor for $R$, by Foreign Merge.