+
−
+
−
+
−\begin{frame}{Merging Branches in SVN}
+
−  The support is incomplete and fragile:
+
−  \begin{itemize}
+
−  \item renamed files are not merged correctly
+
−  \item old clients will not update the merge info
+
−  \end{itemize}
+
−
+
−  \pause
+
−
+
−  From the SVN Book:
+
−  \begin{center}
+
−  \begin{tikzpicture}
+
−    \node[draw=structure, fill=structure!20!white, text justified,
+
−      text width=0.95\textwidth, font=\small] {The bottom line is that
+
−      Subversion's merge-tracking feature has an \alert{extremely
+
−        complex} internal implementation, and the
+
−      \texttt{svn:mergeinfo} property is the only window the user has
+
−      into the machinery. Because the feature is \alert{relatively
+
−        new}, a numbers of edge cases and possible unexpected
+
−      behaviors may pop up. \hfill\itshape ---Version Control with
+
−      Subversion};
+
−  \end{tikzpicture}
+
−
+
−  (Mercurial has robust built-in support for merging branches.)
+
−  \end{center}
+
−\end{frame}