Differences between revisions 42 and 43
Revision 42 as of 2009-08-04 16:16:46
Size: 2908
Editor: youshe
Comment: Updated to last version (2009-08)
Revision 43 as of 2009-08-04 16:25:03
Size: 2972
Editor: youshe
Comment: Mistake : the french translation was here
Deletions are marked like this. Additions are marked like this.
Line 1: Line 1:
#language fr
## TNorth <tnorth@gdj.ch> 08.2005. Traduction rapide, certainement à corriger !
## Frédéric Bouquet (youshe) <youshe.jaalon@gmail.com> 08.2009. Mise à jour du texte conformément à la version anglaise
''You might first want to read [[UnderstandingMercurial]]''
Line 5: Line 3:
(Traduction de l'anglais : [[Tutorial]]) = A tutorial on using Mercurial =
Line 7: Line 5:
= Un tutoriel sur l'utilisation de Mercurial = This tutorial is an introduction to using Mercurial. We don't assume any particular background in using [[SCM]] software.
Line 9: Line 7:
Ce tutoriel est une instroduction sur l'utilisation de Mercurial. Nous n'assumons aucune connaissance préalable sur l'utilisation d'autres outils de gestion de version ([[SCM]]). 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
Line 11: Line 11:
Après avoir suivi ce tutoriel, vous aurez appris des notions de base sur les points suivants: It is also strongly recommended that you have a look at the Mercurial man pages [[http://www.selenic.com/mercurial/hg.1.html|hg(1)]] and [[http://www.selenic.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 13: Line 13:
 * Les concepts de base et les commandes dont vous avez besoin pour utiliser Mercurial
 * Comment utiliser Mercurial de façon simple pour contribuer à des projets logiciels
The tutorial is split into the following pages:
Line 16: Line 15:
Il est également chaudement recommandé de jeter un coup d'oeil aux pages de manuel de [[http://www.selenic.com/mercurial/hg.1.html|hg(1)]] et [[http://www.selenic.com/mercurial/hgrc.5.html|hgrc(5)]] qui sont aussi disponibles dans l'arborescence de fichiers des sources en tant que {{{doc/hg.1.txt}}} et {{{doc/hgrc.5.txt}}}. Vous pouvez aussi utiliser depuis la ligne de commande : `hg help <commande>`  1. [[TutorialInstall]] - installing Mercurial
 1. [[TutorialClone]] - making a copy of an existing [[Repository|repository]]
 1. [[TutorialHistory]] - navigating the history of a repository
 1. [[TutorialFirstChange]] - making your first change
 1. [[TutorialShareChange]] - sharing changes with another repository
 1. [[TutorialExport]] - sharing changes with another person
 1. [[TutorialMerge]] - handling multiple independent changes to a file
 1. [[TutorialConflict]] - handling [[Merge|merges]] that need manual resolution
 1. [[TutorialConclusion]] - the end
Line 18: Line 25:
= Comment lire ce tutoriel ? = == How to read this tutorial ==
Line 20: Line 27:
Les conventions de formatage sont simples. Les noms des commandes et les paramètres sont affichés à l'aide de {{{fontes fixes}}}. The formatting convention is simple. Command names and parameters are displayed in {{{fixed font}}}.
Line 22: Line 29:
Une ligne d'entrée que vous devriez taper dans votre terminal ou invite de commande est affichée à l'aide d'une fonte fixe, et la ligne commencera avec le caractère {{{$}}}. 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 24: Line 31:
Une ligne de sortie attendue à l'affichage de la part de Mercurial ou de votre invite de commande est également affichée avec une fonte fixe, mais sans qu'aucun caractère spécial ne soit présent en début de ligne. 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 27: Line 34:
 $ ceci est une ligne d'entrée de votre part
 ceci est une ligne de sortie d'un programme.
$ this is a line of user input
this is a line of program output
Line 30: Line 37:
Nous utilisons le shell {{{bash}}} dans tous les exemples. Les concepts restent les mêmes pour les autres shells Unix et {{{cmd.exe}}} de Windows bien que la syntaxe de certaines opérations peut éventuellement changer. Par exemple, {{{ls}}} dans un shell unix est équivalent à un {{{dir}}} sous MS Windows, de même qu'un {{{vi}}} sous Unix est similaire à un {{{edit}}} sous Windows.
Line 32: Line 38:
Pour commencer : [[FrenchTutorialInstall|Installer mercurial]] 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 34: Line 40:
Table des matières: Now, let's begin with [[TutorialInstall]].
Line 36: Line 42:
 * [[FrenchTutorialInstall|Installer Mercurial]]
 * [[FrenchTutorialClone|Copier un dépôt existent]]
 * [[FrenchTutorialHistory|Naviguer dans l'historique d'un dépôt]]
 * [[FrenchTutorialFirstChange|Première modification]]
 * [[FrenchTutorialShareChange|Partagez vos changesets]]
 * [[FrenchTutorialExport|exportez vos changements]]
 * [[FrenchTutorialMerge|Fusionner des branches/dépôts (merge)]]
 * [[FrenchTutorialConflict|Gérer les conflits de version lors d'une fusion]]
 * [[FrenchTutorialConclusion|Conclusion]]
== Translations ==

Work to translate the Tutorial into the following languages has been contributed (in alphabetic order):<<BR>>

[[ChineseTutorial|Chinese]],
[[FrenchTutorial|French]],
[[GermanTutorial|German]],
[[ItalianTutorial|Italian]],
[[JapaneseTutorial|Japanese]],
[[KoreanTutorial|Korean]],
[[BrazilianPortugueseTutorial|Brazilian Portuguese]],
[[SpanishTutorial|Spanish]],
[[RussianTutorial|Russian]],
[[UkrainianTutorial|Ukrainian]],
[[ThaiTutorial|Thai]]

Note that these translations may lag behind compared to the English version.
Line 46: Line 61:
CategoryFrench CategoryTutorial

You might first want to read UnderstandingMercurial

A tutorial on using Mercurial

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 hg(1) and hgrc(5), which are also available in the release tarballs as doc/hg.1.html and doc/hgrc.5.html. You can also use hg help <command> on the command line.

The tutorial is split into the following pages:

  1. TutorialInstall - installing Mercurial

  2. TutorialClone - making a copy of an existing repository

  3. TutorialHistory - navigating the history of a repository

  4. TutorialFirstChange - making your first change

  5. TutorialShareChange - sharing changes with another repository

  6. TutorialExport - sharing changes with another person

  7. TutorialMerge - handling multiple independent changes to a file

  8. TutorialConflict - handling merges that need manual resolution

  9. TutorialConclusion - the end

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.

Now, let's begin with TutorialInstall.

2. Translations

Work to translate the Tutorial into the following languages has been contributed (in alphabetic order):

Chinese, French, German, Italian, Japanese, Korean, Brazilian Portuguese, Spanish, Russian, Ukrainian, Thai

Note that these translations may lag behind compared to the English version.


CategoryTutorial

Tutorial (last edited 2013-09-02 17:41:09 by LeonardoPostacchini)