versionControl/vcs.tex
author Shantanu <shantanu@fossee.in>
Tue, 29 Dec 2009 19:51:55 +0530
changeset 80 e5dcba8a6b13
parent 79 d6dd6541a887
child 81 3d20090b7cbd
permissions -rw-r--r--
More changes to VCS slides.
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}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    30
\lstset{language=Python,
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
%%% This is from Fernando's setup.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    54
% \usepackage{color}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    55
% \definecolor{orange}{cmyk}{0,0.4,0.8,0.2}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    56
% % Use and configure listings package for nicely formatted code
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    57
% \usepackage{listings}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    58
% \lstset{
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    59
%    language=Python,
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    60
%    basicstyle=\small\ttfamily,
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    61
%    commentstyle=\ttfamily\color{blue},
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    62
%    stringstyle=\ttfamily\color{orange},
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    63
%    showstringspaces=false,
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    64
%    breaklines=true,
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    65
%    postbreak = \space\dots
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    66
% }
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
% Title page
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    70
\title[Version Control Systems]{SEES: Version Control Systems}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    71
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    72
\author[FOSSEE] {FOSSEE}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    73
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    74
\institute[IIT Bombay] {Department of Aerospace Engineering\\IIT Bombay}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    75
\date[]{}
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
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    78
%\pgfdeclareimage[height=0.75cm]{iitmlogo}{iitmlogo}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    79
%\logo{\pgfuseimage{iitmlogo}}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    80
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    81
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    82
%% Delete this, if you do not want the table of contents to pop up at
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    83
%% the beginning of each subsection:
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    84
\AtBeginSubsection[]
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    85
{
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    86
  \begin{frame}<beamer>
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    87
    \frametitle{Outline}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    88
    \tableofcontents[currentsection,currentsubsection]
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    89
  \end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    90
}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    91
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    92
\AtBeginSection[]
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    93
{
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    94
  \begin{frame}<beamer>
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    95
    \frametitle{Outline}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    96
    \tableofcontents[currentsection,currentsubsection]
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    97
  \end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    98
}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
    99
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   100
% If you wish to uncover everything in a step-wise fashion, uncomment
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   101
% the following command: 
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   102
%\beamerdefaultoverlayspecification{<+->}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   103
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   104
%%\includeonlyframes{current,current1,current2,current3,current4,current5,current6}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   105
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   106
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   107
% DOCUMENT STARTS
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   108
\begin{document}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   109
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   110
\begin{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   111
  \maketitle
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   112
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   113
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   114
% CREATING TOC 
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   115
\begin{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   116
  \frametitle{Outline}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   117
  \tableofcontents
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   118
  % You might wish to add the option [pausesections]
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   119
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   120
78
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   121
%% There are some %$ used just to minimise the effect of $ sign used in lstlisting. In emacs it looks unhealthy.
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   122
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   123
% 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
   124
\section{Introduction}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   125
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   126
\begin{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   127
  \frametitle{What is Version Control?}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   128
  \begin{block}{From a blog post}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   129
    ``Version control (or source control) is nothing more arcane than keeping copies of ones work as one make changes to it.''
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   130
  \end{block}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   131
  \pause
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   132
  \begin{block}{}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   133
    It is better to use these tools rather then wasting creativity to invent VCS which have files with names like \begin{color}{red}{prog1.py, prog2.py}\end{color} or \begin{color}{red}prog-old.py, prog.py.\end{color}
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   134
  \end{block}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   135
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   136
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   137
\begin{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   138
  \frametitle{Motivation behind such tools}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   139
  \begin{itemize}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   140
  \item Track the history and evolution of a program.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   141
  \item To collaborate effectively on a project.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   142
  \item \begin{color}{red}``To err is Human''\end{color} \pause for recovery we have ``Version Control''
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   143
  \end{itemize}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   144
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   145
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   146
\begin{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   147
  \frametitle{How is done What is done?}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   148
  \begin{itemize}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   149
  \item It keeps track of changes you make to a file. You can improvise, revisit, and amend.
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   150
  \item All procedure is logged/recorded, so you and others can follow the development cycle.
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   151
  \end{itemize}  
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   152
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   153
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   154
\begin{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   155
  \frametitle{Do we really need this?}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   156
  \emphbar{For team of people working remotely(even different computers/machines) on a project, use of version control is inevitable!}
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   157
  \vspace{0.15in}
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   158
  \emphbar{For single person: managing projects and assignments becomes easy}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   159
  \vspace{0.15in}
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   160
  \pause
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   161
  \emphbar{\color{red}{Its a good habit!}}
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   162
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   163
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   164
\begin{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   165
  \frametitle{Whats on the menu!}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   166
  \begin{itemize}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   167
  \item cvs (Concurrent Version System)
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   168
  \item svn (Subversion)
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   169
  \item hg (Mercurial)
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   170
  \item bzr (Bazaar)
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   171
  \item git
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   172
  \end{itemize}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   173
  \inctime{10}
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   174
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   175
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   176
% Introduction to jargons 
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   177
\section{Learning the Lingo!}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   178
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   179
\begin{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   180
  \frametitle{Common jargons: Basic setup}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   181
  \begin{itemize}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   182
  \item Repository(repo):\\
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   183
        The folder with all files.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   184
  \item Server:\\
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   185
        Machine with main inventory/repo.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   186
  \item Client:\\
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   187
        Local machines with copy of main repo.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   188
  \end{itemize}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   189
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   190
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   191
\begin{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   192
  \frametitle{Actions}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   193
  \begin{itemize}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   194
  \item Add:\\
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   195
    Adding file into the repo for the first time.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   196
  \item Version:\\
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   197
    Version number of a file.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   198
  \item Head/Tip:\\
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   199
    The latest revision of the repo.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   200
  \item Check out/Clone:\\
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   201
    Initial download of repo onto machine.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   202
  \item Commit:\\
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   203
    Recording a change.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   204
  \item Change log/History:\\
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   205
    List of changes made to repo.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   206
  \end{itemize}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   207
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   208
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   209
\begin{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   210
  \frametitle{Actions cont...}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   211
  \begin{itemize}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   212
  \item Branch:\\
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   213
    Separate local copy of repo for bug fixing, testing.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   214
  \item Diff/Change:\\
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   215
    Finding the differences in a file in two versions.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   216
  \item Merge (or patch):\\
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   217
    Apply the changes to file, to make it up-to-date.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   218
  \item Conflict:\\
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   219
    When merging a file is not obvious.
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   220
  \item Resolve:\\
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   221
    Fixing the conflict manually.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   222
  \end{itemize}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   223
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   224
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   225
% Types of Version Controls
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   226
\section{Types of VCS}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   227
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   228
\begin{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   229
  \frametitle{Types:}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   230
  Based on way of managing the repo there are two types of VCS:
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   231
  \begin{itemize}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   232
  \item Centralized VCS\\
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   233
    cvs, svn falls under this category.
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   234
  \item Distributed VCS\\
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   235
    hg, bzr, git follows this methodology.
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   236
  \end{itemize}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   237
  \emphbar{We would be covering \typ{hg}}
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   238
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   239
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   240
\begin{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   241
  \frametitle{Why hg?}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   242
    \includegraphics[height=.75in, interpolate=true]{mercurial}
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   243
  \begin{itemize}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   244
  \item Easy to learn and use.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   245
  \item Lightweight.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   246
  \item Scales excellently.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   247
  \item Based on Python.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   248
  \end{itemize}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   249
  \inctime{10}
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   250
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   251
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   252
% Initializing the repo, cloning, committing changes, pushing, pulling to repo.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   253
\section{Getting Started}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   254
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   255
\begin{frame}[fragile]
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   256
  \frametitle{Getting comfortable:}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   257
  Try following commands:
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   258
  \begin{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   259
    $ hg version    
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   260
    $ hg help
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   261
    $ hg help diff
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   262
  \end{lstlisting} %$
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   263
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   264
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   265
\begin{frame}[fragile]
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   266
  \frametitle{Cloning a repo}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   267
  Clone is used to make a copy of an existing repository. This repo can be both local or remote.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   268
  \begin{lstlisting}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   269
$ hg clone \
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   270
  http://hg.serpentine.com/tutorial/hello \
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   271
  localCopyhello
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   272
  \end{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   273
  And we get a local copy of this repository. 
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   274
  \begin{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   275
$ ls localCopyhello/
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   276
hello.c  Makefile
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   277
  \end{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   278
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   279
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   280
\begin{frame}[fragile]
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   281
  \frametitle{Creating a repo}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   282
  To start a new repository \typ{hg} provides \typ{init} command.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   283
  \begin{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   284
$ mkdir Fevicol
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   285
$ cd Fevicol/
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   286
$ echo "print 'Yeh Fevicol ka majboot 
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   287
              jod hai'" > feviStick.py
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   288
$ ls -a
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   289
.  ..  feviStick.py
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   290
$ hg init
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   291
$ ls -a
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   292
.  ..  feviStick.py  .hg
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   293
  \end{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   294
\typ{.hg} folder will store the logs related to this repo.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   295
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   296
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   297
\begin{frame}[fragile]
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   298
  \frametitle{Cloning a local repo: Branching}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   299
  All \typ{hg} repositories are self-contained, and independent which can be cloned. Like:
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   300
  \begin{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   301
$ hg clone localCopyhello newCopy
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   302
updating working directory
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   303
2 files updated, 0 files merged, 
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   304
0 files removed, 0 files unresolved
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   305
  \end{lstlisting}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   306
  or
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   307
  \begin{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   308
$ hg clone Fevicol Fevicol-pull
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   309
updating working directory
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   310
0 files updated, 0 files merged, 
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   311
0 files removed, 0 files unresolved
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   312
  \end{lstlisting}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   313
  \inctime{15}
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   314
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   315
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   316
\begin{frame}[fragile]
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   317
  \frametitle{History/Logs}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   318
  To check out track record of a repo one has to use \typ{log} command.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   319
  \begin{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   320
$ cd localCopyhello
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   321
$ hg log    
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   322
  \end{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   323
  The output of previous command have following fields:
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   324
  \begin{itemize}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   325
  \item changeset: identifiers for the changeset.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   326
  \item user: person who creates the changeset.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   327
  \item date: The date and time of creation of changeset.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   328
  \item summary: The one line description of changeset.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   329
  \end{itemize}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   330
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   331
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   332
\begin{frame}[fragile]
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   333
  \frametitle{History/Logs cont...}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   334
By default it returns complete logs of all changes. To make it selective use:
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   335
\begin{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   336
  $ hg log -r 3
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   337
  $ hg log -r 2:4
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   338
\end{lstlisting}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   339
  To see tip/latest commit history use:\\
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   340
\typ{$ hg tip} \\ %$
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   341
  \inctime{5}
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   342
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   343
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   344
\begin{frame}[fragile]
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   345
  \frametitle{Adding files}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   346
  We will revisit the Fevicol repo we created earlier.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   347
  \begin{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   348
$ cd Fevicol
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   349
$ hg log
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   350
$ hg st
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   351
? feviStick.py
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   352
  \end{lstlisting} %$
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   353
  "?" sign in front of name indicates that this file is not yet part of track record. \typ{add} command is used to add new files to repo.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   354
  \begin{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   355
$ hg add feviStick.py
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   356
$ hg st
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   357
A feviStick.py
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   358
  \end{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   359
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   360
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   361
\begin{frame}[fragile]
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   362
  \frametitle{Committing changes}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   363
  \typ{hg} uses \typ{ci} (alias \typ{commit}) command to make changes logged. So after adding a file, we have to commit it also by:
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   364
  \begin{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   365
$ hg ci -u "Shantanu <shantanu@fossee.in>" 
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   366
        -m "First commit."
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   367
$ hg log
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   368
changeset:   0:84f5e91f4de1
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   369
tag:         tip
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   370
user:        Shantanu <shantanu@fossee.in>
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   371
date:        Fri Aug 21 23:37:13 2009 +0530
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   372
summary:     First commit.    
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   373
  \end{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   374
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   375
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   376
\begin{frame}[fragile]
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   377
  \frametitle{More basic operations}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   378
  \begin{lstlisting}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   379
$ hg cp feviStick.py pidiLite.py
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   380
$ hg rename pidiLite.py feviCol.py
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   381
$ hg st
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   382
A feviCol.py
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   383
$ hg ci -u "Shantanu <shantanu@fossee.in>" 
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   384
        -m "Added feviCol.py."
80
e5dcba8a6b13 More changes to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 79
diff changeset
   385
$ hg tip| grep summary 
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   386
summary:     Renamed feviStick.py.
80
e5dcba8a6b13 More changes to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 79
diff changeset
   387
  \end{lstlisting} %$
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   388
%% Other commands which can be handy are \typ{cp}, \typ{remove}, \typ{revert} etc.
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   389
  \inctime{10}
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   390
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   391
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   392
% Introduction to concepts of branches, merging patch?
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   393
\section{Sharing and Collaborating}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   394
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   395
\begin{frame}[fragile]
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   396
  \frametitle{Distributing changes}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   397
  As this repo is self-contained, hence changeset just created are local and are not propagated to previously cloned Fevicol-pull.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   398
  \begin{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   399
$ hg pull 
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   400
pulling from /home/baali/Fevicol
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   401
requesting all changes
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   402
adding changesets
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   403
adding manifests
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   404
adding file changes
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   405
added 2 changesets with 2 changes to 2 files
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   406
(run 'hg update' to get a working copy)
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   407
  \end{lstlisting} %$
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   408
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   409
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   410
\begin{frame}[fragile]
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   411
  \frametitle{Pulling changesets cont...}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   412
  As pointed by previous command output, hg \typ{pull} does not(by default) update current directory. It just imports changesets. To add all these changesets one have to update using \typ{up} command:
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   413
  \begin{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   414
$ cd Fevicol-pull
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   415
$ ls -a
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   416
.  ..  .hg
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   417
$ hg up
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   418
2 files updated, 0 files merged, 
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   419
0 files removed, 0 files unresolved
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   420
$ ls -a
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   421
.  ..  feviCol.py  feviStick.py  .hg    
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   422
  \end{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   423
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   424
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   425
\begin{frame}[fragile]
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   426
  \frametitle{Making changes across the repos}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   427
  \begin{lstlisting}
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   428
$ Fevicol-clone/
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   429
  \end{lstlisting} %$
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   430
  Lets edit and correct the feviStick.py 
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   431
\begin{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   432
$ echo "print 'Ab no more Chip Chip'" 
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   433
        > feviStick.py
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   434
$ hg st
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   435
M feviStick.py
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   436
\end{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   437
  'M' sign indicates that Mercurial has noticed change.\\
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   438
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   439
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   440
\begin{frame}[fragile]
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   441
  \frametitle{Revisiting changes}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   442
To revisit changes made earlier use \typ{diff} command:
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   443
\begin{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   444
$ hg diff
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   445
diff -r a7912d45f47c feviStick.py
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   446
--- a/feviStick.py   Sun Aug 23 22:34:35 2009 +0530
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   447
+++ b/feviStick.py   Sun Aug 23 22:47:49 2009 +0530
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   448
@@ -1,1 +1,1 @@
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   449
-print 'Yeh Fevicol ka Majboot jod hai'
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   450
+print 'Ab no more Chip Chip'
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   451
  \end{lstlisting} %$
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   452
  These changes are not logged until you commit them.\\
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   453
  \begin{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   454
$ hg ci -u "Shantanu <shantanu@fossee.in>" 
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   455
      -m "Changed tagline for feviStick.py."
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   456
  \end{lstlisting} %$
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   457
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   458
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   459
\begin{frame}[fragile]
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   460
  \frametitle{Syncing two repos}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   461
  Now to bring both the repos to same stage one have to \typ{push} changes.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   462
  \begin{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   463
$ hg push 
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   464
pushing to /home/baali/Fevicol
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   465
searching for changes
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   466
adding changesets
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   467
adding manifests
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   468
adding file changes
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   469
added 1 changesets with 1 changes to 1 files
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   470
  \end{lstlisting} %$
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   471
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   472
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   473
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   474
\begin{frame}[fragile]
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   475
  \frametitle{Syncing cont...}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   476
  Same as pulling, pushing wont update the main repo by default. Try running following command:
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   477
  \begin{lstlisting}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   478
$ cd Fevicol
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   479
$ hg tip    
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   480
$ cat feviStick.py
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   481
  \end{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   482
  \typ{tip} shows latest changeset, but content of file are not updated. We have to use \typ{up} on main branch
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   483
  \begin{lstlisting}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   484
$ hg up
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   485
1 files updated, 0 files merged, 0 files removed, 0 files unresolved    
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   486
  \end{lstlisting} %$
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   487
  \inctime{15}
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   488
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   489
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   490
\begin{frame}[fragile]
78
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   491
  \frametitle{Merging: Scenario}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   492
  One very useful feature is merging work of different peers working on same project.\\
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   493
  We consider scenario, two person on one project, both have local copies, and one among them is main branch.\\
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   494
  \begin{center}
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   495
    \includegraphics[height=1in, interpolate=true]{scenario}
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   496
  \end{center}  
78
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   497
\end{frame}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   498
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   499
78
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   500
\begin{frame}[fragile]
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   501
  \frametitle{Making changes to one of repo}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   502
  \begin{lstlisting}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   503
$ cd Fevicol-pull
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   504
$ echo "print 'Yeh Fevicol ka Majboot jod 
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   505
        hai, tootega nahin'" > feviCol.py
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   506
$ hg st
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   507
M feviStick.py
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   508
$ hg ci -u "Shantanu <shantanu@fossee.in>" 
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   509
     -m "Updated tag line for feviCol.py."
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   510
$ hg tip| grep changeset
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   511
changeset:   4:caf986b15e05
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   512
  \end{lstlisting} %$
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   513
\end{frame}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   514
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   515
\begin{frame}[fragile]
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   516
  \frametitle{In the meanwhile, other repo is ...}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   517
  \begin{lstlisting}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   518
$ cd Fevicol
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   519
$ echo "print 'Jor laga ke hayyiya'" 
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   520
        > firstAdd.py
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   521
$ hg add 
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   522
$ hg st
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   523
A firstAdd.py
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   524
$ hg ci -u "Shantanu <shantanu@fossee.in>"
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   525
        -m "Added firsAdd.py."
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   526
$ hg tip|grep changeset
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   527
changeset:   4:fadbd6492cc4    
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   528
  \end{lstlisting}
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   529
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   530
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   531
\begin{frame}[fragile]
78
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   532
  \frametitle{Merging}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   533
  \begin{lstlisting}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   534
$ hg pull ../Fevicol-pull
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   535
pulling from ../Fevicol-pull
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   536
searching for changes
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   537
adding changesets
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   538
adding manifests
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   539
adding file changes
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   540
added 1 changesets with 1 changes to 1 files (+1 heads)
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   541
(run 'hg heads' to see heads, 'hg merge' to merge)    
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   542
  \end{lstlisting} %$
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   543
  Output is already suggesting something!
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   544
\end{frame}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   545
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   546
%% Here one can mention the point of having push and pull separate. Because of this policy, changes made are not lost.
78
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   547
\begin{frame}[fragile]
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   548
  \frametitle{Analyzing events in detail}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   549
  Since hg \typ{pull} don't update the files directly, our changes are still safe. Following command can help us deal this merging problem in better way:
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   550
  \begin{lstlisting}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   551
$ hg heads
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   552
  \end{lstlisting}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   553
  This commands shows repo/branch heads.
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   554
  \begin{lstlisting}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   555
$ hg glog    
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   556
  \end{lstlisting}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   557
  It shows revision history alongside an ASCII revision graph.\\
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   558
  Because of different track, \typ{up} command fails.
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   559
  \begin{lstlisting}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   560
$ hg up
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   561
abort: crosses branches (use 'hg merge' or 'hg update -C')
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   562
  \end{lstlisting} %$
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   563
\end{frame}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   564
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   565
\begin{frame}[fragile]
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   566
  \frametitle{Merging}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   567
  \typ{hg merge} command merge working directory with another revision.
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   568
  \begin{lstlisting}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   569
$ hg merge    
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   570
  \end{lstlisting} %$
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   571
  After merging two branches, we have to commit the results to create a common head.
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   572
  \begin{lstlisting}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   573
$ hg ci -u "Shantanu <shantanu@fossee.in>" 
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   574
        -m "Merged branches."
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   575
$ hg heads    
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   576
$ hg glog
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   577
  \end{lstlisting} %$
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   578
  \inctime{15}
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   579
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   580
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   581
% Steps to follow to make life easier. How to avoid/handle manual merges.
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   582
\section{Work flow: DOS and DON'Ts}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   583
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   584
\begin{frame}
78
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   585
  \frametitle{Motto behind hg}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   586
  \begin{center}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   587
  \color{red}{``Commit Early Commit Often.''}\\  
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   588
  \end{center}  
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   589
\end{frame}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   590
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   591
\begin{frame}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   592
  \frametitle{Cheat Sheet}
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   593
  \begin{center}
80
e5dcba8a6b13 More changes to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 79
diff changeset
   594
  \includegraphics[height=2.8in]{mod}  
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   595
  \end{center}  
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   596
\end{frame}
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   597
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   598
\begin{frame}
78
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   599
  \frametitle{Steps to be followed}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   600
  \begin{itemize}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   601
  \item Make changes.
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   602
  \item Commit.
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   603
  \item Pull changesets.
80
e5dcba8a6b13 More changes to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 79
diff changeset
   604
  \item Merge(if required).
78
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   605
  \item Push.
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   606
  \end{itemize}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   607
  \inctime{10}
78
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   608
\end{frame}
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   609
216f6670abfd Added merging part in VCS slides.
Shantanu <shantanu@fossee.in>
parents: 77
diff changeset
   610
\begin{frame}
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   611
  \frametitle{Suggested Readings:}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   612
  \begin{itemize}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   613
  \item \url{http://mercurial.selenic.com/guide/}
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   614
  \item \url{http://hgbook.red-bean.com/}    
77
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   615
  \item \url{http://karlagius.com/2009/01/09/version-control-for-the-masses/}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   616
  \item Articles related to version control available on \url{http://betterexplained.com/}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   617
  \item \url{http://en.wikipedia.org/wiki/Revision_control}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   618
  \item \url{http://wiki.alliedmods.net/Mercurial_Tutorial}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   619
  \end{itemize}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   620
\end{frame}
708e1f6a9a89 Created initial slides for VCS till merging.
Shantanu <shantanu@fossee.in>
parents:
diff changeset
   621
\end{document}
79
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   622
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   623
Notes
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   624
-----
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   625
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   626
From http://mercurial.selenic.com/
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   627
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   628
Quick Start
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   629
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   630
Clone a project and push changes
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   631
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   632
$ hg clone http://selenic.com/repo/hello
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   633
$ cd hello
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   634
$ (edit files)
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   635
$ hg add (new files)
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   636
$ hg commit -m 'My changes'
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   637
$ hg push
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   638
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   639
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   640
Create a project and commit
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   641
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   642
$ hg init (project-directory)
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   643
$ cd (project-directory)
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   644
$ (add some files)
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   645
$ hg add
d6dd6541a887 Added some images to VCS slides.
Shantanu <shantanu@fossee.in>
parents: 78
diff changeset
   646
$ hg commit -m 'Initial commit'