Table des matières

Création des branches pérennes

Cette page présente un "brouillon" pour la création des branches pérennes telles qu'elle est présentée (et réellement réalisée) dans un exercice ici → : Exercice

H:\essais\build_xml>hg glog --style compact
@  1[tip]:0,-1   8b21deb1ddf9   2014-06-19 22:28 +0200   daniele
|    Ajout du fichier build.xml closes #2
|
o  0:-1,-1   5b4782aaddd2   2014-06-19 22:27 +0200   daniele
     ParamÚtrage du depot Mercurial closes #6

Il s'agit, ici, de créer des branches nommées dont la durée de vie sera celle de l'application.

Création de la branche stable

Commande de création de la branche nommée

H:\essais\build_xml>hg branch stable

marked working directory as branch stable
(branches are permanent and global, did you want a bookmark?)

Enregistrement de la branche dans le dépôt

H:\essais\build_xml>hg commit -u daniele -m "Ajout de la branche stable"

calling hook commit.lfiles: hgext.largefiles.reposetup.checkrequireslfiles
committed changeset 2:0908014185d127703357bc518d548b7d13e25865

H:\essais\build_xml>hg glog –style compact

@  2[tip]:1,-1   0908014185d1   2014-06-23 14:51 +0200   daniele
|    Ajout de la branche stable
|
o  1:0,-1   8b21deb1ddf9   2014-06-19 22:28 +0200   daniele
|    Ajout du fichier build.xml closes #2
|
o  0:-1,-1   5b4782aaddd2   2014-06-19 22:27 +0200   daniele
     ParamÚtrage du depot Mercurial closes #6

H:\essais\build_xml>hg log

changeset:   2:0908014185d127703357bc518d548b7d13e25865
branch:      stable
tag:         tip
phase:       draft
parent:      1:8b21deb1ddf97d6f16239a2d08151be2aa8cc590
parent:      -1:0000000000000000000000000000000000000000
manifest:    1:539f3f20213ae06e60497f9a35e91e982f9baea7
user:        daniele
date:        Mon Jun 23 14:51:00 2014 +0200
extra:       branch=stable
description:
Ajout de la branche stable


changeset:   1:8b21deb1ddf97d6f16239a2d08151be2aa8cc590
parent:      0:5b4782aaddd2bfe24cc34abfc4cc468bae934122
parent:      -1:0000000000000000000000000000000000000000
manifest:    1:539f3f20213ae06e60497f9a35e91e982f9baea7
user:        daniele
date:        Thu Jun 19 22:28:00 2014 +0200
files+:      build.xml
extra:       branch=default
description:
Ajout du fichier build.xml closes #2


changeset:   0:5b4782aaddd2bfe24cc34abfc4cc468bae934122
parent:      -1:0000000000000000000000000000000000000000
parent:      -1:0000000000000000000000000000000000000000
manifest:    0:18fcc6f123166e6a2092782a3e09b434bdeb43a2
user:        daniele
date:        Thu Jun 19 22:27:28 2014 +0200
files+:      .hgignore
extra:       branch=default
description:
ParamÚtrage du depot Mercurial closes #6

Création de la branche maintenance

H:\essais\build_xml>hg branch maintenance

marked working directory as branch maintenance
(branches are permanent and global, did you want a bookmark?)

H:\essais\build_xml>hg commit -u daniele -m "Ajout de la branche maintenance"

calling hook commit.lfiles: hgext.largefiles.reposetup.checkrequireslfiles
committed changeset 3:fc61541ec1440c4c0bcc2a38dc87f9f704a6bceb

H:\essais\build_xml>hg heads –style compact

3[tip]:2,-1   fc61541ec144   2014-06-23 14:55 +0200   daniele
  Ajout de la branche maintenance

2:1,-1   0908014185d1   2014-06-23 14:51 +0200   daniele
  Ajout de la branche stable

1:0,-1   8b21deb1ddf9   2014-06-19 22:28 +0200   daniele
  Ajout du fichier build.xml closes #2

H:\essais\build_xml>hg glog –style compact

@  3[tip]:2,-1   fc61541ec144   2014-06-23 14:55 +0200   daniele
|    Ajout de la branche maintenance
|
o  2:1,-1   0908014185d1   2014-06-23 14:51 +0200   daniele
|    Ajout de la branche stable
|
o  1:0,-1   8b21deb1ddf9   2014-06-19 22:28 +0200   daniele
|    Ajout du fichier build.xml closes #2
|
o  0:-1,-1   5b4782aaddd2   2014-06-19 22:27 +0200   daniele
     ParamÚtrage du depot Mercurial closes #6

Création de la branche prepare-release

H:\essais\build_xml>hg update -r 0

resolving manifests
 branchmerge: False, force: False, partial: False
 ancestor: 8b21deb1ddf9, local: 8b21deb1ddf9+, remote: 5b4782aaddd2
 build.xml: other deleted -> r
removing build.xml
updating: build.xml 1/1 files (100.00%)
0 files updated, 0 files merged, 1 files removed, 0 files unresolved

H:\essais\build_xml>hg branch prepare-release

marked working directory as branch prepare-release
(branches are permanent and global, did you want a bookmark?)

H:\essais\build_xml>hg commit -u daniele -m "Ajout de la branche prepare-release"

H:\essais\build_xml>hg commit -u daniele -m "Ajout de la branche prepare-release"
calling hook commit.lfiles: hgext.largefiles.reposetup.checkrequireslfiles
committed changeset 4:fa155425fad3127962f796ad031a30562c5e6c52
H:\essais\build_xml>hg glog --style compact
@  4[tip]:0,-1   fa155425fad3   2014-06-23 15:10 +0200   daniele
|    Ajout de la branche prepare-release
|
| o  3:2,-1   fc61541ec144   2014-06-23 14:55 +0200   daniele
| |    Ajout de la branche maintenance
| |
| o  2:1,-1   0908014185d1   2014-06-23 14:51 +0200   daniele
| |    Ajout de la branche stable
| |
| o  1:0,-1   8b21deb1ddf9   2014-06-19 22:28 +0200   daniele
|/     Ajout du fichier build.xml closes #2
|
o  0:-1,-1   5b4782aaddd2   2014-06-19 22:27 +0200   daniele
     ParamÚtrage du depot Mercurial closes #6


H:\essais\build_xml>hg summary
parent: 4:fa155425fad3 tip
 Ajout de la branche prepare-release
branch: prepare-release
commit: (clean)
update: (current)
mq:     (empty queue)

H:\essais\build_xml>hg update -r0
resolving manifests
 branchmerge: False, force: False, partial: False
 ancestor: fa155425fad3, local: fa155425fad3+, remote: 5b4782aaddd2
0 files updated, 0 files merged, 0 files removed, 0 files unresolved

H:\essais\build_xml>hg summary
parent: 0:5b4782aaddd2
 ParamÚtrage du depot Mercurial closes #6
branch: default
commit: (clean)
update: 1 new changesets (update)
mq:     (empty queue)