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{ Ingredients }{
22 \bigforall_{R \in \set R}
30 \[ \eqn{ Unique Tips }{
31 C \haspatch \p \implies
33 \pendsof{C}{\py} = \{ T \}
36 \[ \eqn{ Foreign Unaffected }{
37 \pendsof{C}{\foreign} = \pendsof{L}{\foreign}
40 \subsection{Lemma: Foreign Identical}
42 $\isforeign{D} \implies \big[ D \le C \equiv D \le L \big]$.
45 Trivial by Foreign Unaffected and the definition of $\pends$
48 \subsection{No Replay}
50 Ingredients Prevent Replay applies:
51 $A = L$ always satisfies the $\exists$. $\qed$
53 \subsection{Unique Base}
55 Not applicable, by Base Only.
57 \subsection{Tip Contents}
59 Not applicable, by Base Only.
61 \subsection{Base Acyclic}
63 Relevant only if $L \in \pn$. For $D = C$, $D \in \pn$; OK.
64 For $D \neq C$, OK by Base Acyclic for $L$. $\qed$
66 \subsection{Coherence and Patch Inclusion}
70 L \haspatch \p : & C \haspatch \p \\
71 L \nothaspatch \p : & C \nothaspatch \p
76 Consider some $D \in \py$. $D \neq C$ by Base Only.
77 So $C \has \p \equiv L \has \p$.
80 \subsection{Unique Tips}
82 Explicitly dealt with by our Unique Tips condition.
84 \subsection{Foreign Inclusion}
86 True by Foreign Identical, and Foreign Inclusion of $L$.
88 \subsection{Foreign Contents}
92 \subsection{Bases' Children}
94 We need to consider this for $D=L$ and also for $D=R$ ($R \in \set
97 For $D=L$, if $L \in \pn$ then $C \in \pn$, OK; whereas if
98 $L \not \in \pn$ Bases' Children is inapplicable.
103 If $L \in \py, R \in \py$: not applicable for either $D=L$ or $D=R$.
105 If $L \in \py, R \in \pn$: not applicable for $L$, OK for $R$.
107 Other possibilities for $L \in \py$ are excluded by Tip Merge.
109 If $L \in \pn, R \in \pn$: satisfied for both $L$ and $R$.
111 If $L \in \pn, R \in \foreign$: satisfied for $L$, not applicable for
114 If $L \in \pn, R \in \pqy$: satisfied for $L$, not applicable for
117 Other possibilities for $L \in \pn$ are excluded by Base Merge.
119 If $L \in \foreign$: not applicable for $L$; nor for $R$, by Foreign Merges.