summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorWill L Fife <sarlalian@gmail.com>2018-10-28 11:31:13 -0700
committerWill L Fife <sarlalian@gmail.com>2018-10-28 11:31:13 -0700
commit7825aa838433851d03c393bceb06716bdcfafb66 (patch)
treef87154e724ff6c596ded376559991258b01782df
parentcc2b3dca73edfb6231a79bf483730af28e7a99d7 (diff)
Multiple changes
- Remove double newlines - Merge lists - fix locations where lines are > 80 chars. - Remove excess whitespace in table
-rw-r--r--mercurial.html.markdown122
1 files changed, 49 insertions, 73 deletions
diff --git a/mercurial.html.markdown b/mercurial.html.markdown
index f757dd7c..d1cac66c 100644
--- a/mercurial.html.markdown
+++ b/mercurial.html.markdown
@@ -18,82 +18,58 @@ anyone working with versioned files.
Version control is a system that keeps track fo changes to a set of file(s)
and/or directorie(s) over time.
-
### Why Use Mercurial
-* Distributed Architecture
-* Fast
-* Platform Independent
-* Extensible
-* Easy to use
-* Open Source
-
-
-#### Distributed Architecture
-
-Traditionally version control systems such as CVS and Subversion are a client server
-architecture with a central server to store the revsion history of a project. Mercurial however
-is a truly distributed architecture, giving each devloper a full local copy of the entire
-development history. It works independently of a central server.
-
-
-#### Fast
-
-Mercurial is implemented to be fast. You are able to generate diffs between
-revsions, and switch between tags and branches with little time and effort.
-Mercurial is used by large projects such as OpenJDK
-([hg](http://hg.openjdk.java.net/jdk7/jdk7)) and NetBeans
-([hg](http://hg.netbeans.org/)).
-
-#### Platform Independent
-
-Mercurial was written to be highly platform independent. Much of Mercurial is
-written in Python, with small performance critical parts written in portable
-C. Binary releases are available for all major platforms.
-
-
-#### Extensible
-
-The functionality of Mercurial can be increased with extensions, either by
-activating the official ones which are shipped with Mercurial or downloading
-some [from the wiki](https://www.mercurial-scm.org/wiki/UsingExtensions) or by
-[writing your own](https://www.mercurial-scm.org/wiki/WritingExtensions).
-Extensions are written in Python and can change the workings of the basic
-commands, add new commands and access all the core functions of Mercurial.
-
-
-#### Easy to Use
-
-The Mercurial command set is consistent with what subversion users would
-expect, so they are likely to feel right at home. Most dangerous actions
-are part of extensions that need to be enabled to be used.
-
-
-#### Open Source
-
-Mercurial is free software licensed under the terms of the [GNU General Public
-License Version 2](http://www.gnu.org/licenses/gpl-2.0.txt) or any later
-version.
-
+* Distributed Architecture - Traditionally version control systems such as CVS
+and Subversion are a client server architecture with a central server to
+store the revsion history of a project. Mercurial however is a truly
+distributed architecture, giving each devloper a full local copy of the
+entire development history. It works independently of a central server.
+
+* Fast - Traditionally version control systems such as CVS and Subversion are a
+client server architecture with a central server to store the revsion history
+of a project. Mercurial however is a truly distributed architecture, giving
+each devloper a full local copy of the entire development history. It works
+independently of a central server.
+
+* Platform Independent - Mercurial was written to be highly platform
+independent. Much of Mercurial is written in Python, with small performance
+critical parts written in portable C. Binary releases are available for all
+major platforms.
+
+* Extensible - The functionality of Mercurial can be increased with extensions,
+either by activating the official ones which are shipped with Mercurial or
+downloading some [from the
+wiki](https://www.mercurial-scm.org/wiki/UsingExtensions) or by [writing your
+own](https://www.mercurial-scm.org/wiki/WritingExtensions). Extensions are
+written in Python and can change the workings of the basic commands, add new
+commands and access all the core functions of Mercurial.
+
+* Easy to use - The Mercurial command set is consistent with what subversion
+users would expect, so they are likely to feel right at home. Most dangerous
+actions are part of extensions that need to be enabled to be used.
+
+* Open Source - Mercurial is free software licensed under the terms of the [GNU
+General Public License Version 2](http://www.gnu.org/licenses/gpl-2.0.txt) or
+any later version.
## Terminology
-| Term | Definition |
+| Term | Definition |
| ------------- | ---------------------------------- |
-| Repository | A repository is a collection of revisions |
-| hgrc | A configuration file which stores the defaults for a repository. |
-| revision | A committed changeset: has a REV number |
-| changeset | Set of changes saved as diffs |
-| diff | Changes between file(s) |
-| tag | A named named revision |
-| parent(s) | Immediate ancestor(s) of a revison |
-| branch | A child of a revision |
-| head | A head is a changeset with no child changesets |
-| merge | The process of merging two HEADS |
-| tip | The latest revision in any branch |
-| patch | All of the diffs between two revisions |
-| bundle | Patch with permisĀ­sions and rename support |
-
+| Repository | A repository is a collection of revisions |
+| hgrc | A configuration file which stores the defaults for a repository. |
+| revision | A committed changeset: has a REV number |
+| changeset | Set of changes saved as diffs |
+| diff | Changes between file(s) |
+| tag | A named named revision |
+| parent(s) | Immediate ancestor(s) of a revison |
+| branch | A child of a revision |
+| head | A head is a changeset with no child changesets |
+| merge | The process of merging two HEADS |
+| tip | The latest revision in any branch |
+| patch | All of the diffs between two revisions |
+| bundle | Patch with permisĀ­sions and rename support |
## Commands
@@ -133,7 +109,6 @@ $ hg status
# Get help on the status subcommand
$ hg help status
-
```
### add
@@ -227,7 +202,8 @@ $ hg commit --amend -m "Correct message"
### diff
-Show differences between revisions for the specified files using the unified diff format.
+Show differences between revisions for the specified files using the unified
+diff format.
```bash
# Show the diff between the current directory and a previous revision
@@ -384,4 +360,4 @@ $ hg remove *.txt
* [Learning Mercurial in Workflows](https://www.mercurial-scm.org/guid)
* [Mercurial Quick Start](https://www.mercurial-scm.org/wiki/QuickStart)
-* [Mercurial: The Definitive Guide by Bryan O'Sullivan](http://hgbook.red-bean.com/)
+* [Mercurial: The Definitive Guide by Bryan O'Sullivan](http://hgbook.red-bean.com/) \ No newline at end of file