Mercurial > hgbook
annotate en/examples/tour-merge-conflict @ 744:1114da00d30e
Fix '<programlisting>' in ch02-tour-basic.xml
| author | Dongsheng Song <dongsheng.song@gmail.com> |
|---|---|
| date | Wed, 18 Mar 2009 19:43:46 +0800 |
| parents | bc14f94e726a |
| children | 4e23c220d1b0 |
| rev | line source |
|---|---|
| 103 | 1 #!/bin/bash |
| 2 | |
| 3 hg init scam | |
| 4 cd scam | |
| 5 | |
| 6 #$ name: wife | |
| 7 | |
| 8 cat > letter.txt <<EOF | |
| 9 Greetings! | |
| 10 | |
| 11 I am Mariam Abacha, the wife of former | |
| 12 Nigerian dictator Sani Abacha. | |
| 13 EOF | |
| 14 | |
| 15 hg add letter.txt | |
| 16 hg commit -m '419 scam, first draft' | |
| 17 | |
| 18 #$ name: cousin | |
| 19 | |
| 20 cd .. | |
| 21 hg clone scam scam-cousin | |
| 22 cd scam-cousin | |
| 23 | |
| 24 cat > letter.txt <<EOF | |
| 25 Greetings! | |
| 26 | |
| 27 I am Shehu Musa Abacha, cousin to the former | |
| 28 Nigerian dictator Sani Abacha. | |
| 29 EOF | |
| 30 | |
| 31 hg commit -m '419 scam, with cousin' | |
| 32 | |
| 33 #$ name: son | |
| 34 | |
| 35 cd .. | |
| 36 hg clone scam scam-son | |
| 37 cd scam-son | |
| 38 | |
| 39 cat > letter.txt <<EOF | |
| 40 Greetings! | |
| 41 | |
| 42 I am Alhaji Abba Abacha, son of the former | |
| 43 Nigerian dictator Sani Abacha. | |
| 44 EOF | |
| 45 | |
| 46 hg commit -m '419 scam, with son' | |
| 47 | |
| 48 #$ name: pull | |
| 49 | |
| 50 cd .. | |
| 51 hg clone scam-cousin scam-merge | |
| 52 cd scam-merge | |
| 53 hg pull -u ../scam-son | |
| 54 | |
| 55 #$ name: merge | |
|
139
ceaca14e49f0
Add local regexps to ignore bits of output.
Bryan O'Sullivan <bos@serpentine.com>
parents:
103
diff
changeset
|
56 #$ ignore: [<>]{7} /tmp/.* |
| 103 | 57 |
| 58 export HGMERGE=merge | |
|
648
bc14f94e726a
Check in a known-broken example to fix up later - XXX
Bryan O'Sullivan <bos@serpentine.com>
parents:
401
diff
changeset
|
59 echo 'XXX this is broken and must be fixed' |
| 103 | 60 hg merge |
| 61 cat letter.txt | |
| 62 | |
| 63 #$ name: commit | |
| 64 | |
| 65 cat > letter.txt <<EOF | |
| 66 Greetings! | |
| 67 | |
| 68 I am Bryan O'Sullivan, no relation of the former | |
| 69 Nigerian dictator Sani Abacha. | |
| 70 EOF | |
| 71 | |
|
401
e281bd9a8e47
Fix sample output for test 'tour-merge-conflict'.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents:
139
diff
changeset
|
72 hg resolve -m letter.txt |
| 103 | 73 hg commit -m 'Send me your money' |
| 74 hg tip |