|
Size: 2091
Comment:
|
Size: 2615
Comment: using alternate help files for now, mention hg help
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 1: | Line 1: |
| (you might first want to read UnderstandingMercurial) |
|
| Line 3: | Line 5: |
| This tutorial is an introduction to using ["Mercurial"]. We don't assume any particular background in using ["SCM"] software. This tutorial is also available in French, following ["FrenchTutorial"] and in Spanish, following ["SpanishTutorial"]. |
''(Translations: [:ChineseTutorial:Chinese], [:FrenchTutorial:French], [:GermanTutorial:German], [:ItalianTutorial:Italian], [:JapaneseTutorial:Japanese], [:KoreanTutorial:Korean], [:BrazilianPortugueseTutorial:Brazilian Portuguese], [:SpanishTutorial:Spanish] [:RussianTutorial:Russian] [:UkrainianTutorial:Ukrainian] )'' This tutorial is an introduction to using Mercurial. We don't assume any particular background in using ["SCM"] software. |
| Line 7: | Line 21: |
| * The basic concepts and commands you'll need to use ["Mercurial"] * How to use ["Mercurial"] in simple ways to contribute to a software project |
* The basic concepts and commands you'll need to use Mercurial * How to use Mercurial in simple ways to contribute to a software project |
| Line 10: | Line 24: |
| It is also strongly recommended that you have a look at the Mercurial man pages hg(1) and hgrc(5) which are in the source tree as doc/hg.1.txt and doc/hgrc.5.txt | It is also strongly recommended that you have a look at the Mercurial man pages [http://www.cadifra.com/mercurial/hg.1.html hg(1)] and [http://www.cadifra.com/mercurial/hgrc.5.html hgrc(5)], which are also available in the [http://www.selenic.com/mercurial/release/?M=D release tarballs] as {{{doc/hg.1.html}}} and {{{doc/hgrc.5.html}}}. You can also use `hg help <command>` on the command line. |
| Line 14: | Line 28: |
| The formatting convention is simple. Command names and parameters are displayed in ''fixed font''. | The formatting convention is simple. Command names and parameters are displayed in {{{fixed font}}}. |
| Line 16: | Line 30: |
| A line of input that you should type into your shell or command prompt is displayed in a fixed font, and the line will start with a ''$'' character. | A line of input that you should type into your shell or command prompt is displayed in a fixed font, and the line will start with a {{{$}}} character. |
| Line 18: | Line 32: |
| A line of output that you should expect ["Mercurial"] or your shell to display is displayed in a fixed font, but with no special character at the start of the line. | A line of output that you should expect Mercurial or your shell to display is displayed in a fixed font, but with no special character at the start of the line. |
| Line 21: | Line 35: |
| $ this is a line of user input this is a line of program output |
$ this is a line of user input this is a line of program output |
| Line 25: | Line 39: |
| We use the ''bash'' shell in all examples. The concepts remain the same for other Unix shells and the Windows ''command.exe'', but the syntax of some operations may change. For example, ''ls'' in a unix shell is roughly equivalent to ''dir'' under MS Windows, and unix ''cat'' is similar to MS Windows ''type''. | We use the {{{bash}}} shell in all examples. The concepts remain the same for other Unix shells and the Windows {{{cmd.exe}}}, but the syntax of some operations may change. For example, {{{ls}}} in a Unix shell is roughly equivalent to {{{dir}}} under Windows, and Unix {{{vi}}} is similar to Windows {{{edit}}}. |
| Line 29: | Line 43: |
| * TutorialInstall - installing ["Mercurial"] * TutorialClone - making a copy of an existing ["Repository"] * TutorialHistory - navigating the history of a ["Repository"] |
* TutorialInstall - installing Mercurial * TutorialClone - making a copy of an existing [:Repository:repository] * TutorialHistory - navigating the history of a repository |
| Line 33: | Line 47: |
| * TutorialShareChange - sharing changes with another ["Repository"] | * TutorialShareChange - sharing changes with another repository |
| Line 36: | Line 50: |
| * TutorialConflict - handling ["Merge"]s that need manual resolution | * TutorialConflict - handling [:Merge:merges] that need manual resolution |
| Line 38: | Line 52: |
---- CategoryTutorial |
(you might first want to read UnderstandingMercurial)
A tutorial on using Mercurial
(Translations: [:ChineseTutorial:Chinese], [:FrenchTutorial:French], [:GermanTutorial:German], [:ItalianTutorial:Italian], [:JapaneseTutorial:Japanese], [:KoreanTutorial:Korean], [:BrazilianPortugueseTutorial:Brazilian Portuguese], [:SpanishTutorial:Spanish] [:RussianTutorial:Russian] [:UkrainianTutorial:Ukrainian] )
This tutorial is an introduction to using Mercurial. We don't assume any particular background in using ["SCM"] software.
After you work through this tutorial, you should have a grasp of the following:
- The basic concepts and commands you'll need to use Mercurial
- How to use Mercurial in simple ways to contribute to a software project
It is also strongly recommended that you have a look at the Mercurial man pages [http://www.cadifra.com/mercurial/hg.1.html hg(1)] and [http://www.cadifra.com/mercurial/hgrc.5.html hgrc(5)], which are also available in the [http://www.selenic.com/mercurial/release/?M=D release tarballs] as doc/hg.1.html and doc/hgrc.5.html. You can also use hg help <command> on the command line.
1. How to read this tutorial
The formatting convention is simple. Command names and parameters are displayed in fixed font.
A line of input that you should type into your shell or command prompt is displayed in a fixed font, and the line will start with a $ character.
A line of output that you should expect Mercurial or your shell to display is displayed in a fixed font, but with no special character at the start of the line.
$ this is a line of user input this is a line of program output
We use the bash shell in all examples. The concepts remain the same for other Unix shells and the Windows cmd.exe, but the syntax of some operations may change. For example, ls in a Unix shell is roughly equivalent to dir under Windows, and Unix vi is similar to Windows edit.
2. Table of contents
TutorialInstall - installing Mercurial
TutorialClone - making a copy of an existing [:Repository:repository]
TutorialHistory - navigating the history of a repository
TutorialFirstChange - making your first change
TutorialShareChange - sharing changes with another repository
TutorialExport - sharing changes with another person
TutorialMerge - handling multiple independent changes to a file
TutorialConflict - handling [:Merge:merges] that need manual resolution
TutorialConclusion - the end