Source

hgbook / fr / examples / branching

Romain PELISSE 547d3aa 





























































#!/bin/bash

#$ name: init

hg init main
cd main
echo 'This is a boring feature.' > myfile
hg commit -A -m 'We have reached an important milestone!'

#$ name: tag

hg tag v1.0
hg tip
hg tags

#$ name: main

cd ../main
echo 'This is exciting and new!' >> myfile
hg commit -m 'Add a new feature'
cat myfile

#$ name: update

cd ..
hg clone -U main main-old
cd main-old
hg update v1.0
cat myfile

#$ name: clone

cd ..
hg clone -rv1.0 main stable

#$ name: stable

hg clone stable stable-fix
cd stable-fix
echo 'This is a fix to a boring feature.' > myfile
hg commit -m 'Fix a bug'
#$ ignore: /tmp/branching.*
hg push

#$ name:

export HGMERGE=$(mktemp)
echo '#!/bin/sh' > $HGMERGE
echo 'echo "This is a fix to a boring feature." > "$1"' >> $HGMERGE
echo 'echo "This is exciting and new!" >> "$1"' >> $HGMERGE
chmod 700 $HGMERGE

#$ name: merge

cd ../main
hg pull ../stable
hg merge
hg commit -m 'Bring in bugfix from stable branch'
cat myfile

#$ name:

rm $HGMERGE
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.