3 Given $L$ and some other commits $\set R$, generate a
4 `fake merge': i.e., a commit which is a descendant of $L$ and $\set R$
5 but whose contents are exactly those of $L$.
8 C \hasparents \{ L \} \cup \set R
10 \patchof{C} = \patchof{L}
12 D \isin C \equiv D \isin L \lor D = C
15 \subsection{Conditions}
21 \[ \eqn{ Unique Tips }{
22 C \haspatch \p \implies
24 \pendsof{C}{\py} = \{ T \}
27 \[ \eqn{ Foreign Unaffected }{
28 \pendsof{C}{\foreign} = \pendsof{L}{\foreign}
31 \subsection{Lemma: Foreign Identical}
33 $\isforeign{D} \implies \big[ D \le C \equiv D \le L \big]$.
36 Trivial by Foreign Unaffected and the definition of $\pends$
39 \subsection{No Replay}
41 Ingredients Prevent Replay applies:
42 $A = L$ always satisfies the $\exists$. $\qed$
44 \subsection{Unique Base}
46 Not applicable, by Base Only.
48 \subsection{Tip Contents}
50 Not applicable, by Base Only.
52 \subsection{Base Acyclic}
54 Relevant only if $L \in \pn$. For $D = C$, $D \in \pn$; OK.
55 For $D \neq C$, OK by Base Acyclic for $L$. $\qed$
57 \subsection{Coherence and Patch Inclusion}
61 L \haspatch \p : & C \haspatch \p \\
62 L \nothaspatch \p : & C \nothaspatch \p
67 Consider some $D \in \py$. $D \neq C$ by Base Only.
68 So $C \has \p \equiv L \has \p$.
71 \subsection{Unique Tips}
73 Explicitly dealt with by our Unique Tips condition.
75 \subsection{Foreign Inclusion}
77 True by Foreign Identical, and Foreign Inclusion of $L$.
79 \subsection{Foreign Contents}