X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=article.tex;h=dc0ca18db3e09445c53e962b05e508821199b607;hb=5e8082d7f849de019800368b07b08ecc43f9400e;hp=e1d47123d04fc3a9bfb2d37437e12e1bf132f171;hpb=fdcbffd5a652eed8c5a7eab663d9dbea690866d1;p=topbloke-formulae.git diff --git a/article.tex b/article.tex index e1d4712..dc0ca18 100644 --- a/article.tex +++ b/article.tex @@ -657,11 +657,10 @@ Simple Foreign Inclusion applies. $\qed$ Not applicable. -\section{Dependency Removal} +\section{Anticommit} Given $L$ which contains $\pr$ as represented by $R^+, R^-$. -Construct $C$ which has $\pr$ removed by applying a single -commit which is the anticommit of $\pr$. +Construct $C$ which has $\pr$ removed. Used for removing a branch dependency. \gathbegin C \hasparents \{ L \} @@ -801,6 +800,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}$. + \subsection{Conditions} \[ \eqn{ Ingredients }{ M \le L, M \le R