bos@103: #!/bin/bash
bos@103: 
bos@103: hg init scam
bos@103: cd scam
bos@103: 
bos@103: #$ name: wife
bos@103: 
bos@103: cat > letter.txt <<EOF
bos@103: Greetings!
bos@103: 
bos@103: I am Mariam Abacha, the wife of former
bos@103: Nigerian dictator Sani Abacha.
bos@103: EOF
bos@103: 
bos@103: hg add letter.txt
bos@103: hg commit -m '419 scam, first draft'
bos@103: 
bos@103: #$ name: cousin
bos@103: 
bos@103: cd ..
bos@103: hg clone scam scam-cousin
bos@103: cd scam-cousin
bos@103: 
bos@103: cat > letter.txt <<EOF
bos@103: Greetings!
bos@103: 
bos@103: I am Shehu Musa Abacha, cousin to the former
bos@103: Nigerian dictator Sani Abacha.
bos@103: EOF
bos@103: 
bos@103: hg commit -m '419 scam, with cousin'
bos@103: 
bos@103: #$ name: son
bos@103: 
bos@103: cd ..
bos@103: hg clone scam scam-son
bos@103: cd scam-son
bos@103: 
bos@103: cat > letter.txt <<EOF
bos@103: Greetings!
bos@103: 
bos@103: I am Alhaji Abba Abacha, son of the former
bos@103: Nigerian dictator Sani Abacha.
bos@103: EOF
bos@103: 
bos@103: hg commit -m '419 scam, with son'
bos@103: 
bos@103: #$ name: pull
bos@103: 
bos@103: cd ..
bos@103: hg clone scam-cousin scam-merge
bos@103: cd scam-merge
bos@103: hg pull -u ../scam-son
bos@103: 
bos@103: #$ name: merge
bos@139: #$ ignore: [<>]{7} /tmp/.*
bos@103: 
bos@103: export HGMERGE=merge
bos@103: hg merge
bos@103: cat letter.txt
bos@103: 
bos@103: #$ name: commit
bos@103: 
bos@103: cat > letter.txt <<EOF
bos@103: Greetings!
bos@103: 
bos@103: I am Bryan O'Sullivan, no relation of the former
bos@103: Nigerian dictator Sani Abacha.
bos@103: EOF
bos@103: 
bos@103: hg commit -m 'Send me your money'
bos@103: hg tip