chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
anticommit clarify note re ingredient order
[topbloke-formulae.git]
/
article.tex
diff --git
a/article.tex
b/article.tex
index 5b86fbc1ea74b068429236d2889686eac7e2b055..090ae13120114180e1a0d49e141f518d5cf15f1a 100644
(file)
--- a/
article.tex
+++ b/
article.tex
@@
-450,8
+450,7
@@
xxx tbd\
\section{Anticommit}
\section{Anticommit}
-Given $L, R^+, R^-$ where
-$R^+ \in \pry, R^- = \baseof{R^+}$.
+Given $L$ and $\pr$ as represented by $R^+, R^-$.
Construct $C$ which has $\pr$ removed.
Used for removing a branch dependency.
\gathbegin
Construct $C$ which has $\pr$ removed.
Used for removing a branch dependency.
\gathbegin
@@
-464,6
+463,9
@@
Used for removing a branch dependency.
\subsection{Conditions}
\subsection{Conditions}
+\[ \eqn{ Ingredients }{
+R^+ \in \pry \land R^- = \baseof{R^+}
+}\]
\[ \eqn{ Into Base }{
L \in \pn
}\]
\[ \eqn{ Into Base }{
L \in \pn
}\]
@@
-480,8
+482,8
@@
By Unique Tip, $R^+ \le L$. By definition of $\base$, $R^- \le R^+$
so $R^- \le L$. So $R^+ \le C$ and $R^- \le C$.
$\qed$
so $R^- \le L$. So $R^+ \le C$ and $R^- \le C$.
$\qed$
-(Note that
the merge base $R^+ \not\le R^-$, i.e. the merge base is
-
later than one of the branches to be merged
.)
+(Note that
$R^+ \not\le R^-$, i.e. the merge base
+
is a descendant, not an ancestor, of the 2nd parent
.)
\subsection{No Replay}
\subsection{No Replay}