versionControl/vcs.tex
author Puneeth Chaganti <punchagan@fossee.in>
Sun, 30 Jan 2011 20:12:46 +0530
changeset 143 fde473906aac
parent 138 a201667fa696
child 144 c592f2304cff
permissions -rw-r--r--
vcs: Mention hg remove command. I was mistaken that everything could be done with the hg add command alone. But apparently hg remove command is necessary.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
     1
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
     2
% Version Control Systems
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
     3
%
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
     4
% Author: FOSSEE 
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
     5
% Copyright (c) 2009, FOSSEE, IIT Bombay
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
     6
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
     7
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
     8
\documentclass[14pt,compress]{beamer}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
     9
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    10
\mode<presentation>
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    11
{
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    12
  \usetheme{Warsaw}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    13
  \useoutertheme{infolines}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    14
  \setbeamercovered{transparent}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    15
}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    16
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    17
\usepackage[english]{babel}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    18
\usepackage[latin1]{inputenc}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    19
%\usepackage{times}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    20
\usepackage[T1]{fontenc}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    21
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    22
% Taken from Fernando's slides.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    23
\usepackage{ae,aecompl}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    24
\usepackage{mathpazo,courier,euler}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    25
\usepackage[scaled=.95]{helvet}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    26
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    27
\definecolor{darkgreen}{rgb}{0,0.5,0}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    28
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    29
\usepackage{listings}
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
    30
\lstset{language=bash,
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    31
    basicstyle=\ttfamily\bfseries,
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    32
    commentstyle=\color{red}\itshape,
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    33
  stringstyle=\color{darkgreen},
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    34
  showstringspaces=false,
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    35
  keywordstyle=\color{blue}\bfseries}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    36
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    37
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    38
% Macros
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    39
\setbeamercolor{emphbar}{bg=blue!20, fg=black}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    40
\newcommand{\emphbar}[1]
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    41
{\begin{beamercolorbox}[rounded=true]{emphbar} 
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    42
      {#1}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    43
 \end{beamercolorbox}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    44
}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    45
\newcounter{time}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    46
\setcounter{time}{0}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    47
\newcommand{\inctime}[1]{\addtocounter{time}{#1}{\tiny \thetime\ m}}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    48
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    49
\newcommand{\typ}[1]{\lstinline{#1}}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    50
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    51
\newcommand{\kwrd}[1]{ \texttt{\textbf{\color{blue}{#1}}}  }
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    52
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    53
% Title page
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    54
\title[Version Control Systems]{SEES: Version Control Systems}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    55
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    56
\author[FOSSEE] {FOSSEE}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    57
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    58
\institute[IIT Bombay] {Department of Aerospace Engineering\\IIT Bombay}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    59
\date[]{}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    60
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    61
\AtBeginSection[]
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    62
{
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    63
  \begin{frame}<beamer>
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    64
    \frametitle{Outline}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    65
    \tableofcontents[currentsection,currentsubsection]
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    66
  \end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    67
}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    68
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    69
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    70
% DOCUMENT STARTS
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    71
\begin{document}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    72
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    73
\begin{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    74
  \maketitle
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    75
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    76
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    77
% CREATING TOC 
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    78
\begin{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    79
  \frametitle{Outline}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    80
  \tableofcontents
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    81
  % You might wish to add the option [pausesections]
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    82
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    83
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
    84
%% There are some %$ used just to minimise the effect of $ sign used
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
    85
%% in lstlisting. In emacs it looks dirty. 
78
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
    86
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    87
% Introduction to course-need of version control, history, options available.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    88
\section{Introduction}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    89
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
    90
\begin{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
    91
  \frametitle{What is Version Control?}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
    92
  \begin{block}{}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
    93
    A way to track changes made to files over time, by keeping copies
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
    94
    of files as we change them.
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
    95
  \end{block}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
    96
\end{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
    97
91
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
    98
%% Home made version control system?
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
    99
\begin{frame}[fragile]
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   100
  \frametitle{Home-brewed}
91
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   101
  \begin{center}
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   102
    An example of a \typ{home-brew} Version Control system
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   103
    \includegraphics[height=1.8in,width=4.2in]{images/folder.png}
91
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   104
  \end{center}
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   105
  \begin{lstlisting} 
91
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   106
$ ls
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   107
a.out  id1.txt  id2.txt  identifier.cpp  id.txt  lex  pda1.cpp  pda2.cpp  pda.cpp  pda.txt  string.txt
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   108
  \end{lstlisting} %%$
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   109
    %%a screen-shot of folder with all crazy names.
91
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   110
\end{frame}
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   111
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   112
\begin{frame}[fragile]
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   113
  \frametitle{Problems}  
91
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   114
  \begin{block}{}    
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   115
  \begin{itemize}
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   116
  \item Name and changes made are not related or linked. 
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   117
  \item Can't track sequence of changes made to a file. 
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   118
  \item Does not scale. 
91
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   119
  \end{itemize}
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   120
    \end{block}
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   121
\end{frame}
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   122
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   123
\begin{frame}[fragile]
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   124
  \frametitle{The need for Version Control}
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   125
  \begin{itemize}
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   126
  \item \alert{To err is Human} \ldots 
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   127
  \item Tracking the history and evolution of a project
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   128
  \item To collaborate effectively on a project
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   129
  \item To efficiently track down bugs and pin-point the changes that
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   130
    caused it 
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   131
  \end{itemize}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   132
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   133
83
c52c9a615356 Added suggestions from Amit and Anoop and some images.
Shantanu <shantanu@fossee.in>
parents: 81
diff changeset
   134
%% Introduction to how logs are managed in VCS.
c52c9a615356 Added suggestions from Amit and Anoop and some images.
Shantanu <shantanu@fossee.in>
parents: 81
diff changeset
   135
%% A analogy in logs and day-to-day life?
c52c9a615356 Added suggestions from Amit and Anoop and some images.
Shantanu <shantanu@fossee.in>
parents: 81
diff changeset
   136
\begin{frame}[fragile]
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   137
  \frametitle{How does it work? --- Analogy}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   138
  It is, in some ways, similar to playing an Video game.
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   139
  \begin{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   140
  \item We play games in stages
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   141
  \item Once we finish a stage or a task -- \alert{we SAVE}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   142
  \item We continue playing
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   143
  \item But, if necessary, we could choose from one of the saved
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   144
    states and start from there
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   145
  \item We could alter the course of the game
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   146
  \end{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   147
\end{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   148
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   149
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   150
\begin{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   151
  \frametitle{Mercurial or \typ{hg}}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   152
  \begin{center}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   153
    \includegraphics[height=.75in,interpolate=true]{images/mercurial_logo}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   154
  \end{center}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   155
  \begin{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   156
  \item Easy to learn and use
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   157
  \item Lightweight
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   158
  \item Scales excellently
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   159
  \item Written in Python
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   160
  \end{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   161
\end{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   162
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   163
\begin{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   164
  \frametitle{Installation}
83
c52c9a615356 Added suggestions from Amit and Anoop and some images.
Shantanu <shantanu@fossee.in>
parents: 81
diff changeset
   165
  \begin{itemize}
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   166
  \item \typ{sudo apt-get install mercurial}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   167
  \item TortoiseHg
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   168
  \item \typ{\$ hg}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   169
  \item \typ{\$ hg version}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   170
  \end{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   171
\end{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   172
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   173
\section{Let there be a Repo!}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   174
% init, status, commit, log, [ui]
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   175
\begin{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   176
  \frametitle{We need a repo!}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   177
  \begin{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   178
  \item A Repository (repo) is where all the action is!
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   179
  \item Project's files plus a special folder that stores all the
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   180
    changes
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   181
  \item We take snapshots of the whole repository; not individual
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   182
    files. 
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   183
  \end{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   184
\end{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   185
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   186
\begin{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   187
  \frametitle{Initializing a repo}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   188
  \begin{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   189
  \item \typ{\$ hg init}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   190
  \item Creates a fresh repository
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   191
  \item Adds a \typ{.hg} directory to our \emph{Working directory}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   192
  \end{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   193
  \emphbar{\typ{.hg} directory keeps log of changes made henceforth}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   194
\end{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   195
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   196
\begin{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   197
  \frametitle{Status report}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   198
  \begin{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   199
  \item \typ{hg status} gives the status of our repo
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   200
  \item Use it often; at least as a beginner
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   201
  \item \typ{hg help command} gives us help about \typ{command}
83
c52c9a615356 Added suggestions from Amit and Anoop and some images.
Shantanu <shantanu@fossee.in>
parents: 81
diff changeset
   202
  \end{itemize}
c52c9a615356 Added suggestions from Amit and Anoop and some images.
Shantanu <shantanu@fossee.in>
parents: 81
diff changeset
   203
\end{frame}
c52c9a615356 Added suggestions from Amit and Anoop and some images.
Shantanu <shantanu@fossee.in>
parents: 81
diff changeset
   204
c52c9a615356 Added suggestions from Amit and Anoop and some images.
Shantanu <shantanu@fossee.in>
parents: 81
diff changeset
   205
\begin{frame}[fragile]
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   206
  \frametitle{Status codes}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   207
  \begin{lstlisting}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   208
    M = modified                                               
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   209
    A = added                                                  
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   210
    R = removed                                                
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   211
    C = clean                                                  
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   212
    ! = missing 
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   213
    ? = not tracked                                            
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   214
    I = ignored                                                
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   215
  \end{lstlisting}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   216
\end{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   217
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   218
\begin{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   219
  \frametitle{Adding files}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   220
  \begin{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   221
  \item From \typ{hg status} we know, none of the files are being
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   222
    tracked, yet. 
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   223
  \item \typ{hg add} --- asking \typ{hg} to track these files
143
fde473906aac vcs: Mention hg remove command.
Puneeth Chaganti <punchagan@fossee.in>
parents: 138
diff changeset
   224
  \item As expected \typ{hg status} prepends an \typ{A} to the file
fde473906aac vcs: Mention hg remove command.
Puneeth Chaganti <punchagan@fossee.in>
parents: 138
diff changeset
   225
  names.
fde473906aac vcs: Mention hg remove command.
Puneeth Chaganti <punchagan@fossee.in>
parents: 138
diff changeset
   226
  \item \typ{? --> A} 
fde473906aac vcs: Mention hg remove command.
Puneeth Chaganti <punchagan@fossee.in>
parents: 138
diff changeset
   227
  \item \typ{! --> R} (\typ{hg remove})
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   228
  \end{itemize}
83
c52c9a615356 Added suggestions from Amit and Anoop and some images.
Shantanu <shantanu@fossee.in>
parents: 81
diff changeset
   229
\end{frame}
c52c9a615356 Added suggestions from Amit and Anoop and some images.
Shantanu <shantanu@fossee.in>
parents: 81
diff changeset
   230
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   231
\begin{frame}
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   232
  \frametitle{Taking Snapshots}
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   233
  \begin{itemize}
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   234
  \item \typ{hg commit}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   235
  \item Asking Mercurial to take a snapshot; remember the changes made
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   236
    to the repository. 
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   237
  \item Commit message is a description of the changes made. 
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   238
  \end{itemize}
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   239
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   240
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   241
\begin{frame}
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   242
  \frametitle{Thumbnail views}
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   243
  \begin{itemize}
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   244
  \item \typ{hg log}~ gives the log of the changes made
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   245
  \item A \typ{changeset} is an atomic collection of changes to the
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   246
    files (between successive commits)
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   247
  \end{itemize}
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   248
  \begin{block}{Log information}
91
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   249
    \begin{itemize}
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   250
    \item \alert{changeset}: Identifiers for the changeset
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   251
    \item \alert{user}: Details of user who created the changeset
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   252
    \item \alert{date}: Date and time of creation
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   253
    \item \alert{summary}: One line description
91
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   254
    \end{itemize}    
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   255
  \end{block}
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   256
\end{frame}
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   257
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   258
\begin{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   259
  \frametitle{User information}
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   260
  \begin{itemize}
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   261
  \item User information is set in the \typ{hgrc} file
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   262
  \item It can be set globally or local to the project
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   263
  \item Global \typ{hgrc}
83
c52c9a615356 Added suggestions from Amit and Anoop and some images.
Shantanu <shantanu@fossee.in>
parents: 81
diff changeset
   264
    \begin{itemize}
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   265
    \item \typ{\$HOME/.hgrc} -- Unix like systems
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   266
    \item \typ{\%HOME\%\\.hgrc} -- Windows
83
c52c9a615356 Added suggestions from Amit and Anoop and some images.
Shantanu <shantanu@fossee.in>
parents: 81
diff changeset
   267
    \end{itemize}
c52c9a615356 Added suggestions from Amit and Anoop and some images.
Shantanu <shantanu@fossee.in>
parents: 81
diff changeset
   268
  \end{itemize}
91
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   269
\end{frame}
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   270
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   271
\begin{frame}
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   272
  \frametitle{\alert{Advice}: \typ{commits}, messages}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   273
  \begin{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   274
  \item Atomic changes; one change with one \typ{commit}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   275
  \item Single line summary --- 60 to 65 characters long
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   276
  \item Followed by paragraphs of detailed description
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   277
    \begin{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   278
    \item Why the change?
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   279
    \item What does it effect?
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   280
    \item Known bugs/issues?
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   281
    \item etc. 
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   282
    \end{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   283
  \end{itemize}
91
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   284
\end{frame}
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   285
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   286
\section{But Why \typ{commit}~?}
91
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   287
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   288
\begin{frame}
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   289
  \frametitle{Operational overhead?}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   290
  \begin{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   291
  \item But why do we \typ{commit}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   292
  \item Isn't all this just adding to operational costs?
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   293
  \item Isn't all this a waste of time?
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   294
  \end{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   295
  \begin{center}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   296
    \emphbar{No! You shall see the benefits, soon!}    
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   297
  \end{center}
91
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   298
\end{frame}
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   299
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   300
\begin{frame}
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   301
  \frametitle{Revert Changes}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   302
  \begin{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   303
  \item Undo all changes; the editor can only do so much.
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   304
  \item \typ{hg revert --all}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   305
  \item \typ{hg revert filename}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   306
  \item Present file, with changes --- \typ{filename.orig}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   307
  \end{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   308
\end{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   309
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   310
\begin{frame}[fragile]
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   311
  \frametitle{Viewing Changes}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   312
  \begin{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   313
  \item \typ{hg diff} --- all changes since last commit
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   314
  \end{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   315
  \begin{block}{}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   316
    \begin{lstlisting}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   317
      - this line was deleted
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   318
      + this line was added
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   319
    \end{lstlisting}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   320
  \end{block}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   321
\end{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   322
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   323
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   324
\begin{frame}[fragile]
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   325
  \frametitle{Revision numbering}
91
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   326
  \begin{itemize}
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   327
  \item \typ{changeset:   n:cbf6e2a375b4}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   328
  \item \typ{n} is the revision number
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   329
  \item The revision number is local to a repository
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   330
  \item \typ{cbf6e2a375b4} is the unique identifier
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   331
  \end{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   332
\end{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   333
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   334
\begin{frame}[fragile]
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   335
  \frametitle{Using revision numbers}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   336
  \begin{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   337
  \item \typ{-r n} can be passed as arguments to commands to specify
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   338
    the revision number
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   339
  \item For instance, \typ{hg log -r0} 
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   340
  \item \typ{m:n} specifies a range of revision numbers
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   341
  \item \typ{-1} gives the \typ{tip}; Negative numbering can be used
91
6f2f2f949e32 Done more changes to version control presentation.
Shantanu <shantanu@fossee.in>
parents: 84
diff changeset
   342
  \end{itemize}
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   343
\end{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   344
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   345
\section{Collaborating with Mercurial}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   346
\begin{frame}[fragile]
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   347
  \frametitle{Cloning Repositories}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   348
  \begin{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   349
  \item \typ{hg clone SOURCE [DEST]}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   350
  \item All \typ{hg} repositories are self-contained
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   351
  \end{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   352
\end{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   353
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   354
\begin{frame}[fragile]
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   355
  \frametitle{Sharing Repositories}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   356
  \begin{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   357
  \item \typ{hg serve}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   358
  \item Can be cloned with \typ{hg clone http://my-ip-address:8000}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   359
  \item We share a central repository; work on our local copies. 
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   360
  \item Set write permissions in \typ{.hg/hgrc}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   361
  \end{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   362
  \begin{lstlisting}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   363
    [web]
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   364
    push_ssl=False
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   365
    allow_push=*
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   366
  \end{lstlisting}
78
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   367
\end{frame}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   368
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   369
\begin{frame}
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   370
  \frametitle{Sharing Changes}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   371
  \begin{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   372
  \item Use \typ{hg push} to push your \typ{commits}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   373
    (\typ{changesets}) to the central repository
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   374
  \end{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   375
\end{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   376
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   377
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   378
\begin{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   379
  \frametitle{Pulling Changes}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   380
  \begin{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   381
  \item \typ{hg incoming} shows new \typ{changesets} in the server 
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   382
  \item To get these \typ{changesets}, we use \typ{hg pull}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   383
  \item These changes do not affect our working directory
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   384
  \item \typ{hg parent} shows the parents of the working directory
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   385
  \end{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   386
\end{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   387
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   388
\begin{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   389
  \frametitle{Pulling Changes \ldots}
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   390
  \begin{itemize}
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   391
  \item \typ{hg update} will update the working directory 
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   392
    \begin{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   393
    \item Updates to the \typ{tip} if no revision is specified
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   394
    \item \typ{tip} is the most recently added changeset 
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   395
    \item Can specify revision number to update to
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   396
    \end{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   397
  \item \typ{hg tip} shows the \typ{tip} of the repository
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   398
  \end{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   399
\end{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   400
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   401
\begin{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   402
  \frametitle{Simultaneous Changes}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   403
  \begin{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   404
  \item The logs of both repositories will be different
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   405
  \item The repositories have diverged
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   406
  \item \typ{hg push} fails, in such a scenario
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   407
  \item \alert{Never, Never, Never, Ever} use \typ{hg push -f}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   408
  \end{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   409
\end{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   410
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   411
\begin{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   412
  \frametitle{Merging}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   413
  \begin{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   414
  \item Pull and merge, when \typ{abort: push creates new remote
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   415
    heads!}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   416
  \item \typ{hg merge} will merge the two diverged heads
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   417
  \item \typ{commit} after you have \typ{merged}!
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   418
  \end{itemize}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   419
\end{frame}
138
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   420
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   421
\begin{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   422
  \frametitle{Simultaneous Changes \ldots}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   423
  \begin{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   424
  \item \typ{outgoing} shows the \typ{changesets} that will be pushed
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   425
  \item \typ{hg push} works!
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   426
  \item Look at the `Change graph'!
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   427
  \end{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   428
\end{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   429
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   430
\begin{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   431
  \frametitle{Simultaneous Conflicting Changes}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   432
  \begin{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   433
  \item What if the changes conflict? -- overlapping edits
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   434
  \item \typ{hg push} fails; \typ{hg pull}; \typ{hg merge}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   435
  \item You now get a diff view with 3 panes 
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   436
    \begin{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   437
    \item First --- current file
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   438
    \item Second --- file with your changes
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   439
    \item Third --- \typ{changesets} that you pulled
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   440
    \end{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   441
  \item Resolve conflict and save
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   442
  \item \typ{hg commit}; \typ{hg push}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   443
  \item Look at the `Change graph'!
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   444
  \end{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   445
\end{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   446
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   447
\section{Conclusion}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   448
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   449
\begin{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   450
  \frametitle{\alert{Advice}: Work-flow}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   451
  General work-flow
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   452
  \begin{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   453
  \item \typ{pull}; \typ{update}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   454
  \item Make changes
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   455
  \item \typ{commit}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   456
  \item If changes on repo, \typ{pull} and \typ{merge}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   457
  \item \typ{push}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   458
  \end{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   459
  \emphbar{Commit Early, Commit Often}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   460
\end{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   461
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   462
\begin{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   463
  \frametitle{References}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   464
  \begin{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   465
  \item \href{http://betterexplained.com/articles/a-visual-guide-to-version-control/}{A Visual Guide to Version Control}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   466
  \item \href{http://karlagius.com/2009/01/09/version-control-for-the-masses/}{Version Control for the Masses}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   467
  \item \href{http://betterexplained.com/articles/intro-to-distributed-version-control-illustrated/}{(Illustrated) Intro to Distributed Version Control}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   468
  \item \href{http://mercurial.selenic.com/wiki/UnderstandingMercurial}{Understanding Mercurial}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   469
  \item \href{http://mercurial.selenic.com/wiki/Tutorial}{A Tutorial on Using Mercurial}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   470
  \item \href{http://hginit.com/}{Hg Init: a Mercurial tutorial}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   471
  \item \href{http://mercurial.selenic.com/wiki/BeginnersGuides}{Beginners Guides}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   472
  \item \href{http://software-carpentry.org/4_0/vc/}{Software Carpentry}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   473
  \end{itemize}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   474
\end{frame}
a201667fa696 vcs: Fix slides.
Puneeth Chaganti <punchagan@fossee.in>
parents: 95
diff changeset
   475
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   476
\end{document}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   477