# HG changeset patch # User Martin Geisler # Date 1328183604 -3600 # Node ID d3c8c0b3ab3c46626641c3814c6a6242d0d166eb # Parent d1977475d41c957e18cbed68c20ef2f7779b7c8a Mention changeset <-> baseline connection diff --git a/pull-merge.tex b/pull-merge.tex --- a/pull-merge.tex +++ b/pull-merge.tex @@ -40,6 +40,15 @@ \onslide<7-> \medskip + Changesets: + \begin{itemize} + \item atomic repository-wide snapshot + \item very similar to a \alert{baseline} in UCM ClearCase + \end{itemize} + + \onslide<8-> + + \medskip Merging: \begin{itemize} \item find common ancestor of $A_2$ and $B_1$: $I$