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:
3d1111b
)
wip merge before rejoin tip merge condition
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 2 Mar 2012 16:24:58 +0000
(16:24 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 2 Mar 2012 16:24:58 +0000
(16:24 +0000)
article.tex
patch
|
blob
|
history
diff --git
a/article.tex
b/article.tex
index 32f79205a8567f3d0efbfded7c9d8d889ff3baa1..d85a022ff8fb8388f380325f4ffd4ed9e4330d5d 100644
(file)
--- a/
article.tex
+++ b/
article.tex
@@
-318,7
+318,7
@@
$D \isin C \equiv D \isin A \equiv D \le A \equiv D \le C$. $\qed$
\section{Merge}
\section{Merge}
-
Given commits $L$, $R$, $M$
:
+
Merge commits $L$ and $R$ using merge base $M$ ($M < L, M < R$)
:
\gathbegin
C \hasparents \{ L, R \}
\gathnext
\gathbegin
C \hasparents \{ L, R \}
\gathnext
@@
-332,9
+332,17
@@
Given commits $L$, $R$, $M$:
\end{cases}
\end{gather}
\end{cases}
\end{gather}
-Conditions
-\gathbegin
- M < L, M < R
-\end{gather}
+\subsection{Conditions}
+
+\[ \eqn{ Merges Exhaustive }{
+ L \in \py => \Bigl[ R \in \py \lor R \in \pn \Bigr]
+}\]
+\[ \eqn{ Tip Merge }{
+ L \in \py \land R \in \py \implies \Bigl[ \text{TBD} \Bigr]
+}\]
+\[ \eqn{ Base Merge }{
+ L \in \py \land R \in \pn \implies \Bigl[ R \ge \baseof{L} \land M =
+ \baseof{L} \Bigr]
+}\]
\end{document}
\end{document}