hgbook
view en/examples/tour-merge-conflict @ 621:1ef7708b3b7f
Rename html to htdocs
| author | Dongsheng Song <dongsheng.song@gmail.com> |
|---|---|
| date | Thu Mar 12 15:35:19 2009 +0800 (2009-03-12) |
| parents | e281bd9a8e47 |
| children | 4e23c220d1b0 |
line source
1 #!/bin/bash
3 hg init scam
4 cd scam
6 #$ name: wife
8 cat > letter.txt <<EOF
9 Greetings!
11 I am Mariam Abacha, the wife of former
12 Nigerian dictator Sani Abacha.
13 EOF
15 hg add letter.txt
16 hg commit -m '419 scam, first draft'
18 #$ name: cousin
20 cd ..
21 hg clone scam scam-cousin
22 cd scam-cousin
24 cat > letter.txt <<EOF
25 Greetings!
27 I am Shehu Musa Abacha, cousin to the former
28 Nigerian dictator Sani Abacha.
29 EOF
31 hg commit -m '419 scam, with cousin'
33 #$ name: son
35 cd ..
36 hg clone scam scam-son
37 cd scam-son
39 cat > letter.txt <<EOF
40 Greetings!
42 I am Alhaji Abba Abacha, son of the former
43 Nigerian dictator Sani Abacha.
44 EOF
46 hg commit -m '419 scam, with son'
48 #$ name: pull
50 cd ..
51 hg clone scam-cousin scam-merge
52 cd scam-merge
53 hg pull -u ../scam-son
55 #$ name: merge
56 #$ ignore: [<>]{7} /tmp/.*
58 export HGMERGE=merge
59 echo 'XXX this is broken and must be fixed'
60 hg merge
61 cat letter.txt
63 #$ name: commit
65 cat > letter.txt <<EOF
66 Greetings!
68 I am Bryan O'Sullivan, no relation of the former
69 Nigerian dictator Sani Abacha.
70 EOF
72 hg resolve -m letter.txt
73 hg commit -m 'Send me your money'
74 hg tip