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 \bigforall_{ D \in \foreign }
29 \left[ \bigexists_{A \in \set A} D \le A \right]
33 TODO THAT IS IMPOSSIBLE TO CALCULATE
35 \subsection{Lemma: Foreign Identical}
37 $\isforeign{D} \implies \big[ D \le C \equiv D \le L \big]$.
40 If $D \le L$, trivially $D \le C$; so conversely
41 $D \not\le C \implies D \not\le L$.
42 Whereas if $D \le C$, either $D \le L$ or
43 $\exists{A \in \set A} D \le A$ (since $D \neq C$),
44 in which case by Foreign Unaffected $D \le L$.
47 \subsection{No Replay}
49 Ingredients Prevent Replay applies:
50 $A = L$ always satisfies the $\exists$. $\qed$
52 \subsection{Unique Base}
54 Not applicable, by Base Only.
56 \subsection{Tip Contents}
58 Not applicable, by Base Only.
60 \subsection{Base Acyclic}
62 Relevant only if $L \in \pn$. For $D = C$, $D \in \pn$; OK.
63 For $D \neq C$, OK by Base Acyclic for $L$. $\qed$
65 \subsection{Coherence and Patch Inclusion}
69 L \haspatch \p : & C \haspatch \p \\
70 L \nothaspatch \p : & C \nothaspatch \p
75 Consider some $D \in \py$. $D \neq C$ by Base Only.
76 So $C \has \p \equiv L \has \p$.
79 \subsection{Unique Tips}
81 Explicitly dealt with by our Unique Tips condition.
83 \subsection{Foreign Inclusion}
85 True by Foreign Identical, and Foreign Inclusion of $L$.
87 \subsection{Foreign Contents}