Mercurial > hg > mercurial-talk

annotate svn-merging.tex @ 357:b3bd9bc3e5f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove extra slides for now
author Martin Geisler <mg@aragost.com>
date Thu, 21 Jun 2012 16:52:16 +0200
parents eddb3d9cf0e2
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
149
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
1
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
2
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
3 \begin{frame}{Merging Branches in SVN}
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
4 The support is incomplete and fragile:
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
5 \begin{itemize}
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
6 \item renamed files are not merged correctly
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
7 \item old clients will not update the merge info
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
8 \end{itemize}
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
9
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
10 \pause
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
11
171
e432304fc029 Stress authority of quote.
Martin Geisler <mg@aragost.com>
parents: 149
diff changeset
12 From the SVN Book:
149
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
13 \begin{center}
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
14 \begin{tikzpicture}
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
15 \node[draw=structure, fill=structure!20!white, text justified,
246
eddb3d9cf0e2 Adjust to new font size
Martin Geisler <mg@lazybytes.net>
parents: 171
diff changeset
16 text width=0.95\textwidth, font=\small] {The bottom line is that
149
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
17 Subversion's merge-tracking feature has an \alert{extremely
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
18 complex} internal implementation, and the
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
19 \texttt{svn:mergeinfo} property is the only window the user has
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
20 into the machinery. Because the feature is \alert{relatively
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
21 new}, a numbers of edge cases and possible unexpected
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
22 behaviors may pop up. \hfill\itshape ---Version Control with
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
23 Subversion};
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
24 \end{tikzpicture}
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
25
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
26 (Mercurial has robust built-in support for merging branches.)
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
27 \end{center}
90fc2363399a Split off slides on SVN branching/merging.
Martin Geisler <mg@aragost.com>
parents:
diff changeset
28 \end{frame}