Revenir à la page précédente	Revenir à la page d'accueil Mercurial

Exercice

Cette page vous présente des résultats d'instructions shell (bash ou MS-DOS) et Mercurial.

Travail demandé

Retrouvez ces instructions

Indiquez en français ce qu'a cherché à faire ce développeur/administrateur réseau.

Pour vous aider, vous pouvez utiliser l'icone en haut à droite : "En ODT" ou "En PDF" et inscrire les instructions dans le texte obtenu.

Résultat de l'exécution

total 20
drwxr-xr-x 3 root root 4096 Jun 23 14:13 .
drwxr-xr-x 3 root root 4096 Jun 23 14:13 ..
drwxr-xr-x 3 root root 4096 Jun 23 14:13 .hg
-rw-r--r-- 1 root root 31 Jun 23 14:13 .hgignore
-rw-r--r-- 1 root root 36 Jun 23 14:13 build.xml
/root/tempo_hg
total 48
drwxr-xr-x 3 root root 4096 Jun 23 14:13 .
drwxr-xr-x 3 root root 4096 Jun 23 14:13 ..
-rw-r--r-- 1 root root 57 Jun 23 14:13 00changelog.i
-rw-r--r-- 1 root root 8 Jun 23 14:13 branch
-rw-r--r-- 1 root root 92 Jun 23 14:13 branchheads.cache
-rw-r--r-- 1 root root 92 Jun 23 14:13 dirstate
-rw-r--r-- 1 root root 64 Jun 23 14:13 hgrc
-rw-r--r-- 1 root root 23 Jun 23 14:13 requires
drwxr-xr-x 3 root root 4096 Jun 23 14:13 store
-rw-r--r-- 1 root root 44 Jun 23 14:13 tags.cache
-rw-r--r-- 1 root root 7 Jun 23 14:13 undo.branch
-rw-r--r-- 1 root root 53 Jun 23 14:13 undo.desc
-rw-r--r-- 1 root root 0 Jun 23 14:13 undo.dirstate
total 48
drwxr-xr-x 3 root root 4096 Jun 23 14:13 .
drwxr-xr-x 3 root root 4096 Jun 23 14:13 ..
-rw-r--r-- 1 root root 57 Jun 23 14:13 00changelog.i
-rw-r--r-- 1 root root 8 Jun 23 14:13 branch
-rw-r--r-- 1 root root 92 Jun 23 14:13 branchheads.cache
-rw-r--r-- 1 root root 92 Jun 23 14:13 dirstate
-rw-r--r-- 1 root root 120 Jun 23 14:13 hgrc
-rw-r--r-- 1 root root 23 Jun 23 14:13 requires
drwxr-xr-x 3 root root 4096 Jun 23 14:13 store
-rw-r--r-- 1 root root 44 Jun 23 14:13 tags.cache
-rw-r--r-- 1 root root 7 Jun 23 14:13 undo.branch
-rw-r--r-- 1 root root 53 Jun 23 14:13 undo.desc
-rw-r--r-- 1 root root 0 Jun 23 14:13 undo.dirstate

echo "
[ui]
username = daniele <daniele.hiot@lycee.jb>
[extensions]
graphlog=
[phases]
publish = False
[web]
encoding = UTF-8
" > ./.hg/hgrc

changeset: 1:8b21deb1ddf9
tag: tip
user: daniele
date: Thu Jun 19 22:28:00 2014 +0200
summary: Ajout du fichier build.xml closes #2
changeset: 0:5b4782aaddd2
user: daniele
date: Thu Jun 19 22:27:28 2014 +0200
summary: Param?trage du depot Mercurial closes #6
total 20
drwxr-xr-x 3 root root 4096 Jun 23 14:13 .
drwxr-xr-x 3 root root 4096 Jun 23 14:13 ..
drwxr-xr-x 3 root root 4096 Jun 23 14:13 .hg
-rw-r--r-- 1 root root 31 Jun 23 14:13 .hgignore
-rw-r--r-- 1 root root 0 Jun 23 14:13 LISEZMOI.txt
-rw-r--r-- 1 root root 36 Jun 23 14:13 build.xml
marked working directory as branch stable
stable 3:d6ef26498edd
default 2:d4117ffd6d0d (inactive)
tip 3:d6ef26498edd
tip 4:170b0a984501
V0.01 3:d6ef26498edd
changeset: 4:170b0a984501
branch: stable
tag: tip
user: daniele <daniele.hiot@lycee.jb>
date: Mon Jun 23 14:13:52 2014 +0000
summary: Added tag V0.01 for changeset d6ef26498edd
changeset: 3:d6ef26498edd
branch: stable
tag: V0.01
user: daniele <daniele.hiot@lycee.jb>
date: Mon Jun 23 14:13:51 2014 +0000
summary: LISEZMOI.txt avec titre
changeset: 2:d4117ffd6d0d
user: daniele <daniele.hiot@lycee.jb>
date: Mon Jun 23 14:13:51 2014 +0000
summary: LISEZMOI.txt vide
changeset: 1:8b21deb1ddf9
user: daniele
date: Thu Jun 19 22:28:00 2014 +0200
summary: Ajout du fichier build.xml closes #2
changeset: 0:5b4782aaddd2
user: daniele
date: Thu Jun 19 22:27:28 2014 +0200
summary: Param?trage du depot Mercurial closes #6
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
marked working directory as branch maintenance
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
marked working directory as branch prep-release
@ changeset: 6:ebd97889959b
| branch: prep-release
| tag: tip
| parent: 2:d4117ffd6d0d
| user: daniele <daniele.hiot@lycee.jb>
| date: Mon Jun 23 14:13:52 2014 +0000
| summary: ajout branche prep-release
|
| o changeset: 5:44d50d2001e2
|/ branch: maintenance
| parent: 2:d4117ffd6d0d
| user: daniele <daniele.hiot@lycee.jb>
| date: Mon Jun 23 14:13:52 2014 +0000
| summary: ajout branche maintenance
|
| o changeset: 4:170b0a984501
| | branch: stable
| | user: daniele <daniele.hiot@lycee.jb>
| | date: Mon Jun 23 14:13:52 2014 +0000
| | summary: Added tag V0.01 for changeset d6ef26498edd
| |
| o changeset: 3:d6ef26498edd
|/ branch: stable
| tag: V0.01
| user: daniele <daniele.hiot@lycee.jb>
| date: Mon Jun 23 14:13:51 2014 +0000
| summary: LISEZMOI.txt avec titre
|
o changeset: 2:d4117ffd6d0d
| user: daniele <daniele.hiot@lycee.jb>
| date: Mon Jun 23 14:13:51 2014 +0000
| summary: LISEZMOI.txt vide
|
o changeset: 1:8b21deb1ddf9
| user: daniele
| date: Thu Jun 19 22:28:00 2014 +0200
| summary: Ajout du fichier build.xml closes #2
|
o changeset: 0:5b4782aaddd2
user: daniele
date: Thu Jun 19 22:27:28 2014 +0200
summary: Param?trage du depot Mercurial closes #6
@ 6[tip]:2 ebd97889959b 2014-06-23 14:13 +0000 daniele
| ajout branche prep-release
|
| o 5:2 44d50d2001e2 2014-06-23 14:13 +0000 daniele
|/ ajout branche maintenance
|
| o 4 170b0a984501 2014-06-23 14:13 +0000 daniele
| | Added tag V0.01 for changeset d6ef26498edd
| |
| o 3[V0.01] d6ef26498edd 2014-06-23 14:13 +0000 daniele
|/ LISEZMOI.txt avec titre
|
o 2 d4117ffd6d0d 2014-06-23 14:13 +0000 daniele
| LISEZMOI.txt vide
|
o 1 8b21deb1ddf9 2014-06-19 22:28 +0200 daniele
| Ajout du fichier build.xml closes #2
|
o 0 5b4782aaddd2 2014-06-19 22:27 +0200 daniele
Param?trage du depot Mercurial closes #6
-- Il y avait un bug dans le fichier LISEZMOI.txt --
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
-- Ajout dans LISEZMOI.txt --
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M .hgtags
M LISEZMOI.txt
@ 11[tip]:2,10 6bb137890448 2014-06-23 14:13 +0000 daniele
|\ Fusion de stable dans default LISEZMOI.txt precise le workflow
| |
| o 10 abb01d174d87 2014-06-23 14:13 +0000 daniele
| | Added tag V0.1.1 for changeset 40a7ace8e96d
| |
| o 9[V0.1.1]:4,8 40a7ace8e96d 2014-06-23 14:13 +0000 daniele
| |\ Fusion de maintenance dans stable LISEZMOI.txt precise le workflow
| | |
| | o 8 96e3fe73e45c 2014-06-23 14:13 +0000 daniele
| | | Modification du fichier LISEZMOI.txt dans branche maintenance
| | |
| | o 7:5,4 ed2c9c0478e6 2014-06-23 14:13 +0000 daniele
| |/| fusion stable dans maintenance
| | |
+-----o 6:2 ebd97889959b 2014-06-23 14:13 +0000 daniele
| | | ajout branche prep-release
| | |
+---o 5:2 44d50d2001e2 2014-06-23 14:13 +0000 daniele
| | ajout branche maintenance
| |
| o 4 170b0a984501 2014-06-23 14:13 +0000 daniele
| | Added tag V0.01 for changeset d6ef26498edd
| |
| o 3[V0.01] d6ef26498edd 2014-06-23 14:13 +0000 daniele
|/ LISEZMOI.txt avec titre
|
o 2 d4117ffd6d0d 2014-06-23 14:13 +0000 daniele
| LISEZMOI.txt vide
|
o 1 8b21deb1ddf9 2014-06-19 22:28 +0200 daniele
| Ajout du fichier build.xml closes #2
|
o 0 5b4782aaddd2 2014-06-19 22:27 +0200 daniele
Param?trage du depot Mercurial closes #6
@ changeset: 11:6bb137890448
|\ tag: tip
| | parent: 2:d4117ffd6d0d
| | parent: 10:abb01d174d87
| | user: daniele <daniele.hiot@lycee.jb>
| | date: Mon Jun 23 14:13:54 2014 +0000
| | summary: Fusion de stable dans default LISEZMOI.txt precise le workflow
| |
| o changeset: 10:abb01d174d87
| | branch: stable
| | user: daniele <daniele.hiot@lycee.jb>
| | date: Mon Jun 23 14:13:53 2014 +0000
| | summary: Added tag V0.1.1 for changeset 40a7ace8e96d
| |
| o changeset: 9:40a7ace8e96d
| |\ branch: stable
| | | tag: V0.1.1
| | | parent: 4:170b0a984501
| | | parent: 8:96e3fe73e45c
| | | user: daniele <daniele.hiot@lycee.jb>
| | | date: Mon Jun 23 14:13:53 2014 +0000
| | | summary: Fusion de maintenance dans stable LISEZMOI.txt precise le workflow
| | |
| | o changeset: 8:96e3fe73e45c
| | | branch: maintenance
| | | user: daniele <daniele.hiot@lycee.jb>
| | | date: Mon Jun 23 14:13:53 2014 +0000
| | | summary: Modification du fichier LISEZMOI.txt dans branche maintenance
| | |
| | o changeset: 7:ed2c9c0478e6
| |/| branch: maintenance
| | | parent: 5:44d50d2001e2
| | | parent: 4:170b0a984501
| | | user: daniele <daniele.hiot@lycee.jb>
| | | date: Mon Jun 23 14:13:53 2014 +0000
| | | summary: fusion stable dans maintenance
| | |
+-----o changeset: 6:ebd97889959b
| | | branch: prep-release
| | | parent: 2:d4117ffd6d0d
| | | user: daniele <daniele.hiot@lycee.jb>
| | | date: Mon Jun 23 14:13:52 2014 +0000
| | | summary: ajout branche prep-release
| | |
+---o changeset: 5:44d50d2001e2
| | branch: maintenance
| | parent: 2:d4117ffd6d0d
| | user: daniele <daniele.hiot@lycee.jb>
| | date: Mon Jun 23 14:13:52 2014 +0000
| | summary: ajout branche maintenance
| |
| o changeset: 4:170b0a984501
| | branch: stable
| | user: daniele <daniele.hiot@lycee.jb>
| | date: Mon Jun 23 14:13:52 2014 +0000
| | summary: Added tag V0.01 for changeset d6ef26498edd
| |
| o changeset: 3:d6ef26498edd
|/ branch: stable
| tag: V0.01
| user: daniele <daniele.hiot@lycee.jb>
| date: Mon Jun 23 14:13:51 2014 +0000
| summary: LISEZMOI.txt avec titre
|
o changeset: 2:d4117ffd6d0d
| user: daniele <daniele.hiot@lycee.jb>
| date: Mon Jun 23 14:13:51 2014 +0000
| summary: LISEZMOI.txt vide
|
o changeset: 1:8b21deb1ddf9
| user: daniele
| date: Thu Jun 19 22:28:00 2014 +0200
| summary: Ajout du fichier build.xml closes #2
|
o changeset: 0:5b4782aaddd2
user: daniele
date: Thu Jun 19 22:27:28 2014 +0200
summary: Param?trage du depot Mercurial closes #6

Revenir à la page d'accueil Mercurial	Aller à la suite des instructions de création des branches