hgbook

view fr/examples/ch04/resolve @ 1004:0298bccbb8ee

find changesets by author, revision, files, or words in the commit message
french small corrections, gestion de révisions au lieu de gestion de sources ou gestion de versions.
author Wilk
date Sun Sep 13 14:08:00 2009 +0200 (2009-09-13)
parents
children
line source
1 #$ name: init
2 hg init conflict
3 cd conflict
4 echo first > myfile.txt
5 hg ci -A -m first
6 cd ..
7 hg clone conflict left
8 hg clone conflict right
9
10 #$ name: left
11 cd left
12 echo left >> myfile.txt
13 hg ci -m left
14
15 #$ name: right
16 cd ../right
17 echo right >> myfile.txt
18 hg ci -m right
19
20 #$ name: pull
21 cd ../conflict
22 hg pull -u ../left
23 hg pull -u ../right
24
25 #$ name: heads
26 hg heads
27
28 #$ name: export
29 export HGMERGE=false
30
31 #$ name: merge
32 hg merge
33
34 #$ name: cifail
35 hg commit -m 'Attempt to commit a failed merge'
36
37 #$ name: list
38 hg resolve -l