SEES: comparison versionControl/handOut.rst

equal deleted inserted replaced

-:79315a169b96
+:4499aebbee83
 ::
 $ cd book/
 $ ls -a
 . .. chapter1.txt chapter2.txt chapter3.txt
-$
 We have three chapters in the folder. We convert this folder into a mercurial
 repository using the ``hg init`` command
 ::
 $ hg init
 $ ls -a
 . .. .hg chapter1.txt chapter2.txt chapter3.txt
-$
 The ``.hg`` directory indicates that our book directory is now a ``hg``
 repository. Mercurial keeps all the history of the changes made, and a few
 other config files, etc. in this directory. The directory, ``book`` is called
 our **working directory**.
 adding chapter3.txt
 $ hg status
 A chapter1.txt
 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. We
 could also specify files individually, for example
 use the ``hg status`` command.
 ::
 $ hg st
-$
 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).
 $ rm chapter3.txt
 $ hg st
 M chapter1.txt
 ! chapter3.txt
-$
 But after a while, you realize that these changes are unwarranted. You
 want to go back to the previous state, undoing all the changes that
 you made, after your friend arrived.
 ::
 $ mv chapter1.txt.orig chapter1.txt
 $ hg st
 M chapter1.txt
-$
 Viewing Changes
 ---------------
 Let's say we now want to ``commit`` these changes, but we are not sure
 3 Revision history
 4 Making and sharing changes
 -5 Merges and Conflicts
 +5 Getting repositories
 +6 Merges and Conflicts
-$
 He then commits these changes and **pushes** them to the central repository
 that we have created.
 ::
 $ hg parent
 changeset:   2:98f7f4a1bb4d
 user:        Puneeth Chaganti <punchagan@fossee.in>
 date:        Fri Jan 28 16:24:42 2011 +0530
 summary:     Replace all occurrences of & with and
-$
 As we can see, the parent is still our last commit, and the changes made by
 Madhusudan are still not in our working directory. To get these changes we do
 the update as suggested by ``hg``.
 tag:         tip
 user:        Madhusudan CS <madhusudancs@fossee.in>
 date:        Fri Jan 28 23:08:25 2011 +0530
 summary:     Add my name to authors and move getting repositories section
 to 5
-$
 As expected the **update** command updates the parent to the latest changes
 that we just pulled from the remote repository.
 The update command can also be used to go back into an older revision, by
 tag:         tip
 user:        Madhusudan CS <madhusudancs@fossee.in>
 date:        Fri Jan 28 23:08:25 2011 +0530
 summary:     Add my name to authors and move getting repositories section
 to 5
-$
 Simultaneous Changes
 --------------------
 Ok, we have been talking about collaboration, but this is a nice situation,
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
-$
 Also, let us assume Madhusudan adds an additional section called References.
 ::
 $ hg diff
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 $ hg merge
 merging chapter1.txt
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, dont forget to commit)
 We have now pull the changes from the central repository and merged them with
 the changes in our repository. But, ``hg`` is warning us not to forget to
 commit. Let's see what is the status of the repository at this point in time.
 ::
 $ hg st
 M chapter1.txt
 ...
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 $ hg merge
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, dont forget to commit)
 What happens now actually depends on how Mercurial is configured and the
 programs available in your machine. You will either get a diff view with 3
 panes or ``merge`` will insert markers in your file at the points where the

changeset 149	4499aebbee83
parent 148	79315a169b96
child 150	8526f94072f6