hgbook
annotate en/examples/ch04/resolve @ 1007:f4f740bb58be
merge with William and Frédéric
| author | Romain PELISSE <belaran@gmail.com> |
|---|---|
| date | Tue Sep 15 13:43:02 2009 +0200 (2009-09-15) |
| parents | 3b640272a966 |
| children |
| rev | line source |
|---|---|
| bos@674 | 1 #$ name: init |
| bos@674 | 2 hg init conflict |
| bos@674 | 3 cd conflict |
| bos@674 | 4 echo first > myfile.txt |
| bos@674 | 5 hg ci -A -m first |
| bos@674 | 6 cd .. |
| bos@674 | 7 hg clone conflict left |
| bos@674 | 8 hg clone conflict right |
| bos@674 | 9 |
| bos@674 | 10 #$ name: left |
| bos@674 | 11 cd left |
| bos@674 | 12 echo left >> myfile.txt |
| bos@674 | 13 hg ci -m left |
| bos@674 | 14 |
| bos@674 | 15 #$ name: right |
| bos@674 | 16 cd ../right |
| bos@674 | 17 echo right >> myfile.txt |
| bos@674 | 18 hg ci -m right |
| bos@674 | 19 |
| bos@674 | 20 #$ name: pull |
| bos@674 | 21 cd ../conflict |
| bos@674 | 22 hg pull -u ../left |
| bos@674 | 23 hg pull -u ../right |
| bos@674 | 24 |
| bos@674 | 25 #$ name: heads |
| bos@674 | 26 hg heads |
| bos@674 | 27 |
| bos@674 | 28 #$ name: export |
| dale@707 | 29 export HGMERGE=false |
| bos@674 | 30 |
| bos@674 | 31 #$ name: merge |
| bos@674 | 32 hg merge |
| bos@674 | 33 |
| bos@674 | 34 #$ name: cifail |
| bos@674 | 35 hg commit -m 'Attempt to commit a failed merge' |
| bos@674 | 36 |
| bos@674 | 37 #$ name: list |
| bos@674 | 38 hg resolve -l |