From 3ca0fff3d7e2f140e888ff286360a19db1828035 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 18 Apr 2012 21:44:08 +0100 Subject: [PATCH 1/1] merge: fix dependency reinsertion blurb to mention the need for the base to be merged first --- merge.tex | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/merge.tex b/merge.tex index 7ca8446..465fcba 100644 --- a/merge.tex +++ b/merge.tex @@ -10,8 +10,9 @@ Merge commits $L$ and $R$ using merge base $M$: \end{gather} We will occasionally use $X,Y$ s.t. $\{X,Y\} = \{L,R\}$. -This can also be used for dependency re-insertion, by setting -$L \in \pn$, $R \in \pry$, $M = \baseof{R}$. +This can also be used for dependency re-insertion, by setting $L \in +\pn$, $R \in \pry$, $M = \baseof{R}$, provided that the Conditions are +satisfied; in particular, provided that $L \ge \baseof{R}$. \subsection{Conditions} \[ \eqn{ Ingredients }{ -- 2.30.2