hgbook
annotate fr/examples/ch04/resolve @ 1015:ef0132c0a014
some typo and better french translation
| author | André Sintzoff <andre.sintzoff@gmail.com> |
|---|---|
| date | Tue Nov 24 15:52:19 2009 +0100 (2009-11-24) |
| parents | |
| children |
| rev | line source |
|---|---|
| belaran@966 | 1 #$ name: init |
| belaran@966 | 2 hg init conflict |
| belaran@966 | 3 cd conflict |
| belaran@966 | 4 echo first > myfile.txt |
| belaran@966 | 5 hg ci -A -m first |
| belaran@966 | 6 cd .. |
| belaran@966 | 7 hg clone conflict left |
| belaran@966 | 8 hg clone conflict right |
| belaran@966 | 9 |
| belaran@966 | 10 #$ name: left |
| belaran@966 | 11 cd left |
| belaran@966 | 12 echo left >> myfile.txt |
| belaran@966 | 13 hg ci -m left |
| belaran@966 | 14 |
| belaran@966 | 15 #$ name: right |
| belaran@966 | 16 cd ../right |
| belaran@966 | 17 echo right >> myfile.txt |
| belaran@966 | 18 hg ci -m right |
| belaran@966 | 19 |
| belaran@966 | 20 #$ name: pull |
| belaran@966 | 21 cd ../conflict |
| belaran@966 | 22 hg pull -u ../left |
| belaran@966 | 23 hg pull -u ../right |
| belaran@966 | 24 |
| belaran@966 | 25 #$ name: heads |
| belaran@966 | 26 hg heads |
| belaran@966 | 27 |
| belaran@966 | 28 #$ name: export |
| belaran@966 | 29 export HGMERGE=false |
| belaran@966 | 30 |
| belaran@966 | 31 #$ name: merge |
| belaran@966 | 32 hg merge |
| belaran@966 | 33 |
| belaran@966 | 34 #$ name: cifail |
| belaran@966 | 35 hg commit -m 'Attempt to commit a failed merge' |
| belaran@966 | 36 |
| belaran@966 | 37 #$ name: list |
| belaran@966 | 38 hg resolve -l |