equal
deleted
inserted
replaced
302 \section{Getting Started} |
302 \section{Getting Started} |
303 |
303 |
304 \begin{frame} |
304 \begin{frame} |
305 \frametitle{Objective} |
305 \frametitle{Objective} |
306 \begin{block}{} |
306 \begin{block}{} |
307 We would \alert{manage} letters collaboratively using \typ{hg}. |
307 We will \alert{manage} letters collaboratively using \typ{hg}. |
308 \end{block} |
308 \end{block} |
309 |
309 |
310 %% \pause |
310 %% \pause |
311 %% \begin{block}{Disclaimer} |
311 %% \begin{block}{Disclaimer} |
312 %% Please note, objective is not to learn creative writing, but to learn \alert{hg(mercurial)} via \alert{interesting} use case. |
312 %% Please note, objective is not to learn creative writing, but to learn \alert{hg(mercurial)} via \alert{interesting} use case. |
330 \end{lstlisting} %$ |
330 \end{lstlisting} %$ |
331 \end{frame} |
331 \end{frame} |
332 |
332 |
333 \begin{frame}[fragile] |
333 \begin{frame}[fragile] |
334 \frametitle{Getting working/existing code base} |
334 \frametitle{Getting working/existing code base} |
335 To get a already existing code-base: |
335 To get an already existing code base: |
336 \begin{lstlisting} |
336 \begin{lstlisting} |
337 $ hg clone |
337 $ hg clone |
338 http://hg.serpentine.com/tutorial/hello |
338 http://hg.serpentine.com/tutorial/hello |
339 localCopyhello |
339 localCopyhello |
340 \end{lstlisting} |
340 \end{lstlisting} |
880 %% Manual and force merge |
880 %% Manual and force merge |
881 %% hgignore |
881 %% hgignore |
882 |
882 |
883 %% Reverting to previous versions! |
883 %% Reverting to previous versions! |
884 % Steps to follow to make life easier. How to avoid/handle manual merges. |
884 % Steps to follow to make life easier. How to avoid/handle manual merges. |
885 \section{Work flow: DOS and DON'Ts} |
885 \section{Work flow: DOs and DON'Ts} |
886 |
886 |
887 \begin{frame} |
887 \begin{frame} |
888 \frametitle{Motto behind hg} |
888 \frametitle{Motto behind hg} |
889 \begin{center} |
889 \begin{center} |
890 \color{red}{``Commit Early Commit Often.''} |
890 \color{red}{``Commit Early Commit Often.''} |