internal notation: rename \merge and \mergeof to \commitmerge and \commitmergeof

diff --git a/anticommit.tex b/anticommit.tex
index b8a3993946b3bdd30ed2ce67672b59b2189f760f..ee23c7f40b141f6a655aca1be2882c291ddea522 100644 (file)
--- a/anticommit.tex
+++ b/anticommit.tex
@@ -8,7 +8,7 @@ Used for removing a branch dependency.
 \gathnext
  \patchof{C} = \patchof{L}
 \gathnext
- \mergeof{C}{L}{R^+}{R^-}
+ \commitmergeof{C}{L}{R^+}{R^-}
 \end{gather}
 
 \subsection{Conditions}
@@ -37,7 +37,7 @@ is a descendant, not an ancestor, of the 2nd parent.)
 
 \subsection{No Replay}
 
-By $\merge$,
+By $\commitmerge$,
 $D \isin C \implies D \isin L \lor D \isin R^- \lor D = C$.
 So, by Ordering of Ingredients,
 Ingredients Prevent Replay applies.  $\qed$
@@ -67,13 +67,13 @@ So $D \isin R^+$.
 
 By Base Acyclic for $R^-$, $D \not\isin R^-$.
 
-Apply $\merge$: $D \not\isin C$.  OK.
+Apply $\commitmerge$: $D \not\isin C$.  OK.
 
 \subsubsection{For $D \neq C, D \le L, D \notin \pry$:}
 
 By Tip Contents for $R^+$, $D \isin R^+ \equiv D \isin R^-$.
 
-Apply $\merge$: $D \isin C \equiv D \isin L$.  OK.
+Apply $\commitmerge$: $D \isin C \equiv D \isin L$.  OK.
 
 $\qed$
 

diff --git a/article.tex b/article.tex
index 92092d285d92fc2e228e37e2839a15acf984d11a..8cb19b26b2b44b5483366bb540723ddb94a8e24a 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -84,8 +84,8 @@
 \newcommand{\pancsof}[2]{\pancs ( #1 , #2 ) }
 \newcommand{\pendsof}[2]{\pends ( #1 , #2 ) }
 
-\newcommand{\merge}{{\mathcal M}}
-\newcommand{\mergeof}[4]{\merge(#1,#2,#3,#4)}
+\newcommand{\commitmerge}{{\mathcal M}}
+\newcommand{\commitmergeof}[4]{\commitmerge(#1,#2,#3,#4)}
 %\newcommand{\merge}[4]{{#2 {{\frac{ #1 }{ #3 } #4}}}}
 
 \newcommand{\patch}{{\mathcal P}}

diff --git a/lemmas.tex b/lemmas.tex
index b432f9a5b1f21f727c078c9895e98edc3c061cba..55cba6010f3d097fb88e4e8769583a1447114721 100644 (file)
--- a/lemmas.tex
+++ b/lemmas.tex
@@ -1,6 +1,6 @@
 \section{Some lemmas}
 
-\subsection{Alternative (overlapping) formulations of $\mergeof{C}{L}{M}{R}$}
+\subsection{Alternative (overlapping) formulations of $\commitmergeof{C}{L}{M}{R}$}
 $$
  D \isin C \equiv
   \begin{cases}

diff --git a/merge.tex b/merge.tex
index b43d30fea899e45b07d47c1aae08d67eb2b7ee2a..9022249b8456dd6b0e815a32233352a46bc6f40a 100644 (file)
--- a/merge.tex
+++ b/merge.tex
@@ -6,7 +6,7 @@ Merge commits $L$ and $R$ using merge base $M$:
 \gathnext
  \patchof{C} = \patchof{L}
 \gathnext
- \mergeof{C}{L}{M}{R}
+ \commitmergeof{C}{L}{M}{R}
 \end{gather}
 We will occasionally use $X,Y$ s.t. $\{X,Y\} = \{L,R\}$.
 
@@ -79,7 +79,7 @@ is therefore consistent with our model.
 
 \subsection{No Replay}
 
-By definition of $\merge$,
+By definition of $\commitmerge$,
 $D \isin C \implies D \isin L \lor D \isin R \lor D = C$.
 So, by Ingredients,
 Ingredients Prevent Replay applies.  $\qed$
@@ -135,7 +135,7 @@ $$
 $D \not\isin L \land D \not\isin R$.  $C \not\in \py$ (otherwise $L
 \in \py$ ie $L \haspatch \p$ by Tip Own Contents for $L$).
 So $D \neq C$.
-Applying $\merge$ gives $D \not\isin C$ i.e. $C \nothaspatch \p$.
+Applying $\commitmerge$ gives $D \not\isin C$ i.e. $C \nothaspatch \p$.
 OK.
 
 \subsubsection{For $L \haspatch \p, R \haspatch \p$:}
@@ -149,17 +149,17 @@ For $D \neq C$: $D \le C \equiv D \le L \lor D \le R
 (Likewise $D \le C \equiv D \le X \lor D \le Y$.)
 
 Consider $D \neq C, D \isin X \land D \isin Y$:
-By $\merge$, $D \isin C$.  Also $D \le X$
+By $\commitmerge$, $D \isin C$.  Also $D \le X$
 so $D \le C$.  OK for $C \zhaspatch \p$.
 
 Consider $D \neq C, D \not\isin X \land D \not\isin Y$:
-By $\merge$, $D \not\isin C$.
+By $\commitmerge$, $D \not\isin C$.
 And $D \not\le X \land D \not\le Y$ so $D \not\le C$.
 OK for $C \zhaspatch \p$.
 
 Remaining case, wlog, is $D \not\isin X \land D \isin Y$.
 $D \not\le X$ so $D \not\le M$ so $D \not\isin M$.
-Thus by $\merge$, $D \isin C$.  And $D \le Y$ so $D \le C$.
+Thus by $\commitmerge$, $D \isin C$.  And $D \le Y$ so $D \le C$.
 OK for $C \zhaspatch \p$.
 
 So, in all cases, $C \zhaspatch \p$.
@@ -183,26 +183,26 @@ By Tip Own Contents, $L \haspatch \p$ so $L \neq X$,
 therefore we must have $L=Y$, $R=X$.
 Conversely $R \not\in \py$
 so by Tip Merge $M = \baseof{L}$.  Thus $M \in \pn$ so
-by Base Acyclic $M \nothaspatch \p$.  By $\merge$, $D \isin C$,
+by Base Acyclic $M \nothaspatch \p$.  By $\commitmerge$, $D \isin C$,
 and $D \le C$.  OK.
 
 Consider $D \neq C, M \nothaspatch \p, D \isin Y$:
 $D \le Y$ so $D \le C$.
-$D \not\isin M$ so by $\merge$, $D \isin C$.  OK.
+$D \not\isin M$ so by $\commitmerge$, $D \isin C$.  OK.
 
 Consider $D \neq C, M \nothaspatch \p, D \not\isin Y$:
 $D \not\le Y$.  If $D \le X$ then
 $D \in \pancsof{X}{\py}$, so by Addition Merge Ends and
 Transitive Ancestors $D \le Y$ --- a contradiction, so $D \not\le X$.
-Thus $D \not\le C$.  By $\merge$, $D \not\isin C$.  OK.
+Thus $D \not\le C$.  By $\commitmerge$, $D \not\isin C$.  OK.
 
 Consider $D \neq C, M \haspatch \p, D \isin Y$:
 $D \le Y$ so $D \in \pancsof{Y}{\py}$ so by Removal Merge Ends
 and Transitive Ancestors $D \in \pancsof{M}{\py}$ so $D \le M$.
-Thus $D \isin M$.  By $\merge$, $D \not\isin C$.  OK.
+Thus $D \isin M$.  By $\commitmerge$, $D \not\isin C$.  OK.
 
 Consider $D \neq C, M \haspatch \p, D \not\isin Y$:
-By $\merge$, $D \not\isin C$.  OK.
+By $\commitmerge$, $D \not\isin C$.  OK.
 
 $\qed$
 
@@ -242,7 +242,7 @@ $C \haspatch \p$ so by definition of $\haspatch$, $D \isin C \equiv D
 
 $D \neq C$.  By Tip Contents of $L$,
 $D \isin L \equiv D \isin \baseof{L}$, so by Tip Merge condition,
-$D \isin L \equiv D \isin M$.  So by $\merge$, $D \isin
+$D \isin L \equiv D \isin M$.  So by $\commitmerge$, $D \isin
 C \equiv D \isin R$.  And $R = \baseof{C}$ by Unique Base of $C$.
 Thus $D \isin C \equiv D \isin \baseof{C}$.  OK.
 
@@ -260,7 +260,7 @@ Whereas if $\baseof{L} = \baseof{M}$, by definition of $\base$,
 $\patchof{M} = \patchof{L} = \py$, so by Tip Contents of $M$,
 $D \isin M \equiv D \isin \baseof{M} \equiv D \isin \baseof{L}$.
 
-So $D \isin M \equiv D \isin L$ so by $\merge$,
+So $D \isin M \equiv D \isin L$ so by $\commitmerge$,
 $D \isin C \equiv D \isin R$.  But from Unique Base,
 $\baseof{C} = \baseof{R}$.
 Therefore $D \isin C \equiv D \isin \baseof{C}$.  OK.
@@ -293,17 +293,17 @@ $D \isin C$ and $D \le C$.  OK.
 \subsubsection{For $D \neq C, D \isin M$:}
 
 Thus $D \le M$ so $D \le L$ and $D \le R$ so $D \isin L$ and $D \isin
-R$.  So by $\merge$, $D \isin C$.  And $D \le C$.  OK.
+R$.  So by $\commitmerge$, $D \isin C$.  And $D \le C$.  OK.
 
 \subsubsection{For $D \neq C, D \not\isin M, D \isin X$:}
 
-By $\merge$, $D \isin C$.
+By $\commitmerge$, $D \isin C$.
 And $D \isin X$ means $D \le X$ so $D \le C$.
 OK.
 
 \subsubsection{For $D \neq C, D \not\isin M, D \not\isin L, D \not\isin R$:}
 
-By $\merge$, $D \not\isin C$.
+By $\commitmerge$, $D \not\isin C$.
 And $D \not\le L, D \not\le R$ so $D \not\le C$.
 OK