SEES: comparison versionControl/handOut.rst

equal deleted inserted replaced

-:339230606dc0
+:68508b5175db
 more organized and systematic. You surely would've saved your files, some
 time or the other as ``oldproject.py``, ``latestproject.py`` and so on, or
 date-tagging them as ``project-21-01-10.py``, ``project-20-02-10.py`` and so
 on.
+It is, in some ways, similar to playing a video game. We generally play games
+in stages, saving the game, each time we finish a stage or complete a task.
+We continue playing, but we could, if necessary, choose to go back to one of
+the saved states and start over. In this manner we could change the state of
+the game.
 Why Use Version Control
 =======================
 We have seen that one of the main motivation to use a version system control
 system is the ability to go back to a working version of the file, when
 Just say ``hg`` in your shell, to see some of the commands that ``hg``
 provides and say ``hg version`` to see the version of ``hg`` that has
 been installed on your system.
-Let there be Repository
+Let there be a Repository
-=======================
+=========================
 To start using Mercurial (or ``hg``) and get the benefits of using a version
 control system, we should first have a **repository**. A repository is a
 folder with all your files and a store of all the changes that were made to
 it. To save disk space, ``hg`` doesn't save all the files, but only saves
 R = removed
 C = clean
 ! = missing (deleted by non-hg command, but still tracked)
 ? = not tracked
 I = ignored
 = origin of the previous file listed as A (added)
 ...
 By looking at the codes, it is clear that our files are not *yet* being
 tracked by ``hg``. We now use the add command to ask ``hg`` to track these
 files.
 A chapter2.txt
 A chapter3.txt
 $
 This simply adds all the files in the (working) directory, to the repository.
-As expected, the ``status`` command shows an ``A`` before he file names.
+As expected, the ``status`` command shows an ``A`` before he file names. We
+could also specify files individually, for example
+::
+$ hg add chapter1.txt
+adding chapter1.txt
 Taking Snapshots
 ----------------
 We have added a set of new files to the repository, but we haven't told
 The command does not return anything, when there are no uncommitted changes.
 Also, notice that I have started getting lazy and used only a short name
 ``st`` for the status command. Mercurial accepts short names, as long as they
 can be disambiguated (just like tab completion).
-Viewing the History
+Snapshot's Thumbnail views
--------------------
+--------------------------
 To see the history of the changes to our repository, we use ``hg log``. We
 can view the change that we just made to our repository.
 ::
 But there is a slight problem with the user details that mercurial is saving.
 It saves my username with my machine name. It is a general good practice to
 use your full name with your email id. We set our username in the ``.hgrc``
 file in our Home folder. (``$HOME/.hgrc`` on Unix like systems and
-``%HOME%\.hgrc`` on Windows systems)
+``%HOME%\.hgrc`` on Windows systems) This is a global setting for all the
+projects that we are working on. We could also set the details, at a
+repository level. We shall look at this in due course.
 We open the file in our favorite editor and add the username details.
 ::
 the username settings are being used and also, the summary of the changeset
 shows only the first line in the description that we have added. Also, notice
 that ``hg`` shows the commits in the reverse chronological order, which is
 useful.
-Mercurial Magic
+But why commit?
 ===============
 You must already be wondering, why we need all the overhead of
 ``commit`` and ``log``, etc. What is all this fuss about? "Isn't it
 just a waste of time?"
 push_ssl=False
 allow_push=*
 This will allow anybody to push to the repository, now.
+By the way, this ``hgrc`` is a repository level configuration file. We could
+also set the details of the user information in this file.
 Madhusudan can now push and his changes will appear in the central
 repository.
 ::

changeset 136	68508b5175db
parent 135	339230606dc0
child 139	d309b09761b9