SEES: comparison versionControl/vcs.tex

equal deleted inserted replaced

-:216f6670abfd
+:d6dd6541a887
 \begin{block}{From a blog post}
 ``Version control (or source control) is nothing more arcane than keeping copies of ones work as one make changes to it.''
 \end{block}
 \pause
 \begin{block}{}
-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}ass1.py, ass2.py.\end{color}
+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}
 \end{block}
 \end{frame}
 \begin{frame}
 \frametitle{Motivation behind such tools}
 \begin{frame}
 \frametitle{How is done What is done?}
 \begin{itemize}
 \item It keeps track of changes you make to a file. You can improvise, revisit, and amend.
-\item all procedure is logged/recorded, so you and others can follow the development cycle.
+\item All procedure is logged/recorded, so you and others can follow the development cycle.
 \end{itemize}
 \end{frame}
 \begin{frame}
 \frametitle{Do we really need this?}
-\emphbar{For team of people working remotely(even different computers/machines) on a project use of version control is inevitable!}
+\emphbar{For team of people working remotely(even different computers/machines) on a project, use of version control is inevitable!}
+\vspace{0.15in}
 \emphbar{For single person: managing projects and assignments becomes easy}
+\vspace{0.15in}
 \pause
-\emphbar{Its a good habit!}
+\emphbar{\color{red}{Its a good habit!}}
 \end{frame}
 \begin{frame}
 \frametitle{Whats on the menu!}
 \begin{itemize}
-\item cvs(Concurrent Version System)
+\item cvs (Concurrent Version System)
 \item svn (Subversion)
 \item hg (Mercurial)
 \item bzr (Bazaar)
 \item git
 \end{itemize}
+\inctime{10}
 \end{frame}
 % Introduction to jargons
 \section{Learning the Lingo!}
 \item Diff/Change:\\
 Finding the differences in a file in two versions.
 \item Merge (or patch):\\
 Apply the changes to file, to make it up-to-date.
 \item Conflict:\\
-When merging a file creates a contradict.
+When merging a file is not obvious.
 \item Resolve:\\
 Fixing the conflict manually.
 \end{itemize}
 \end{frame}
 \begin{frame}
 \frametitle{Types:}
 Based on way of managing the repo there are two types of VCS:
 \begin{itemize}
-\item Centralized VCS
+\item Centralized VCS\\
-\item Distributed VCS
+cvs, svn falls under this category.
-\end{itemize}
+\item Distributed VCS\\
+hg, bzr, git follows this methodology.
+\end{itemize}
+\emphbar{We would be covering \typ{hg}}
 \end{frame}
 \begin{frame}
 \frametitle{Why hg?}
+\includegraphics[height=.75in, interpolate=true]{mercurial}
 \begin{itemize}
 \item Easy to learn and use.
 \item Lightweight.
 \item Scales excellently.
 \item Based on Python.
 \end{itemize}
+\inctime{10}
 \end{frame}
 % Initializing the repo, cloning, committing changes, pushing, pulling to repo.
 \section{Getting Started}
 \begin{frame}[fragile]
 \frametitle{Cloning a repo}
 Clone is used to make a copy of an existing repository. This repo can be both local or remote.
 \begin{lstlisting}
-$ hg clone http://hg.serpentine.com/tutorial/hello
+$ hg clone \
-localCopyhello
+http://hg.serpentine.com/tutorial/hello \
+localCopyhello
 \end{lstlisting}
 And we get a local copy of this repository.
 \begin{lstlisting}
 $ ls localCopyhello/
 hello.c  Makefile
 $ hg clone localCopyhello newCopy
 updating working directory
 2 files updated, 0 files merged,
 0 files removed, 0 files unresolved
 \end{lstlisting}
 or
 \begin{lstlisting}
 $ hg clone Fevicol Fevicol-pull
 updating working directory
 0 files updated, 0 files merged,
 0 files removed, 0 files unresolved
 \end{lstlisting}
+\inctime{15}
 \end{frame}
 \begin{frame}[fragile]
 \frametitle{History/Logs}
 To check out track record of a repo one has to use \typ{log} command.
 \end{itemize}
 \end{frame}
 \begin{frame}[fragile]
 \frametitle{History/Logs cont...}
-By default it returns complete logs of all changes. To make it selective try:
+By default it returns complete logs of all changes. To make it selective use:
 \begin{lstlisting}
 $ hg log -r 3
 $ hg log -r 2:4
 \end{lstlisting}
 To see tip/latest commit history use:\\
-\typ{$ hg tip} %$
+\typ{$ hg tip} \\ %$
+\inctime{5}
 \end{frame}
 \begin{frame}[fragile]
 \frametitle{Adding files}
 We will revisit the Fevicol repo we created earlier.
 \begin{lstlisting}
 $ cd Fevicol
 $ hg log
-$ hg status
+$ hg st
 ? feviStick.py
 \end{lstlisting} %$
 "?" 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.
 \begin{lstlisting}
 $ hg add feviStick.py
 \end{lstlisting}
 \end{frame}
 \begin{frame}[fragile]
 \frametitle{Committing changes}
-\typ{hg} uses \typ{commit} (alias \typ{ci}) command to make changes logged. So after adding a file, we have to commit it also by:
+\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:
 \begin{lstlisting}
 $ hg ci -u "Shantanu <shantanu@fossee.in>"
 -m "First commit."
 $ hg log
 changeset:   0:84f5e91f4de1
 \end{frame}
 \begin{frame}[fragile]
 \frametitle{More basic operations}
 \begin{lstlisting}
-$ hg rename feviStick.py feviCol.py
+$ hg cp feviStick.py pidiLite.py
+$ hg rename pidiLite.py feviCol.py
 $ hg st
 A feviCol.py
 $ hg ci -u "Shantanu <shantanu@fossee.in>"
--m "Renamed feviStick.py."
+-m "Added feviCol.py."
 $ hg tip
 changeset:   1:d948fb4137c5
 tag:         tip
 user:        Shantanu <shantanu@fossee.in>
 date:        Sat Aug 22 00:11:25 2009 +0530
 summary:     Renamed feviStick.py.
 \end{lstlisting}
 %% Other commands which can be handy are \typ{cp}, \typ{remove}, \typ{revert} etc.
+\inctime{10}
 \end{frame}
 % Introduction to concepts of branches, merging patch?
 \section{Sharing and Collaborating}
 \end{lstlisting} %$
 \end{frame}
 \begin{frame}[fragile]
 \frametitle{Pulling changesets cont...}
-as last line of previous command suggest, 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:
+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:
 \begin{lstlisting}
 $ cd Fevicol-pull
 $ ls -a
 .  ..  .hg
 $ hg up
 \end{lstlisting}
 \end{frame}
 \begin{frame}[fragile]
 \frametitle{Making changes across the repos}
-\typ{$ cd Fevicol-clone/}\\ %$
+\begin{lstlisting}
+$ Fevicol-clone/
+\end{lstlisting} %$
 Lets edit and correct the feviStick.py
 \begin{lstlisting}
 $ echo "print 'Ab no more Chip Chip'"
 > feviStick.py
 $ hg st
 'M' sign indicates that Mercurial has noticed change.\\
 \end{frame}
 \begin{frame}[fragile]
 \frametitle{Revisiting changes}
-To look back at the changes made there is \typ{diff} command:
+To revisit changes made earlier use \typ{diff} command:
 \begin{lstlisting}
 $ hg diff
 diff -r a7912d45f47c feviStick.py
 --- a/feviStick.py   Sun Aug 23 22:34:35 2009 +0530
 +++ b/feviStick.py   Sun Aug 23 22:47:49 2009 +0530
 \begin{frame}[fragile]
 \frametitle{Syncing cont...}
 Same as pulling, pushing wont update the main repo by default. Try running following command:
 \begin{lstlisting}
+$ cd Fevicol
 $ hg tip
 $ cat feviStick.py
 \end{lstlisting}
 \typ{tip} shows latest changeset, but content of file are not updated. We have to use \typ{up} on main branch
 \begin{lstlisting}
 $ hg up
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 \end{lstlisting} %$
+\inctime{15}
 \end{frame}
 \begin{frame}[fragile]
 \frametitle{Merging: Scenario}
 One very useful feature is merging work of different peers working on same project.\\
-We consider scenario, two person on one project, both have local copies, and one among them is main branch.
+We consider scenario, two person on one project, both have local copies, and one among them is main branch.\\
+\begin{center}
+\includegraphics[height=1in, interpolate=true]{scenario}
+\end{center}
 \end{frame}
 \begin{frame}[fragile]
 \frametitle{Making changes to one of repo}
 (run 'hg heads' to see heads, 'hg merge' to merge)
 \end{lstlisting} %$
 Output is already suggesting something!
 \end{frame}
+%% Here one can mention the point of having push and pull separate. Because of this policy, changes made are not lost.
 \begin{frame}[fragile]
 \frametitle{Analyzing events in detail}
 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:
 \begin{lstlisting}
 $ hg heads
 $ hg ci -u "Shantanu <shantanu@fossee.in>"
 -m "Merged branches."
 $ hg heads
 $ hg glog
 \end{lstlisting} %$
+\inctime{15}
 \end{frame}
 % Steps to follow to make life easier. How to avoid/handle manual merges.
 \section{Work flow: DOS and DON'Ts}
 \begin{frame}
 \frametitle{Motto behind hg}
 \begin{center}
 \color{red}{``Commit Early Commit Often.''}\\
+\end{center}
+\end{frame}
+\begin{frame}
+\frametitle{Cheat Sheet}
+\begin{center}
+\includegraphics[height=2.8in, interpolate=true]{dongwoo-Hg-120dpi}
 \end{center}
 \end{frame}
 \begin{frame}
 \frametitle{Steps to be followed}
 \item Commit.
 \item Pull changesets.
 \item Merge if required.
 \item Push.
 \end{itemize}
+\inctime{10}
 \end{frame}
 \begin{frame}
 \frametitle{Suggested Readings:}
 \begin{itemize}
-\item \url{http://hgbook.red-bean.com/}
+\item \url{http://mercurial.selenic.com/guide/}
+\item \url{http://hgbook.red-bean.com/}
 \item \url{http://karlagius.com/2009/01/09/version-control-for-the-masses/}
 \item Articles related to version control available on \url{http://betterexplained.com/}
 \item \url{http://en.wikipedia.org/wiki/Revision_control}
 \item \url{http://wiki.alliedmods.net/Mercurial_Tutorial}
 \end{itemize}
 \end{frame}
 \end{document}
+Notes
+-----
+From http://mercurial.selenic.com/
+Quick Start
+Clone a project and push changes
+$ hg clone http://selenic.com/repo/hello
+$ cd hello
+$ (edit files)
+$ hg add (new files)
+$ hg commit -m 'My changes'
+$ hg push
+Create a project and commit
+$ hg init (project-directory)
+$ cd (project-directory)
+$ (add some files)
+$ hg add
+$ hg commit -m 'Initial commit'

changeset 79	d6dd6541a887
parent 78	216f6670abfd
child 80	e5dcba8a6b13