annotate en/examples/tour-merge-conflict @ 130:26b7a4e943aa

Describe the bisect extension.
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 28 Dec 2006 14:06:15 -0800
parents 5b80c922ebdd
children ceaca14e49f0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
103
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1 #!/bin/bash
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 hg init scam
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 cd scam
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 #$ name: wife
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 cat > letter.txt <<EOF
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9 Greetings!
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
11 I am Mariam Abacha, the wife of former
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
12 Nigerian dictator Sani Abacha.
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
13 EOF
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
14
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
15 hg add letter.txt
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
16 hg commit -m '419 scam, first draft'
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
17
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
18 #$ name: cousin
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
19
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
20 cd ..
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
21 hg clone scam scam-cousin
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
22 cd scam-cousin
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
23
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
24 cat > letter.txt <<EOF
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
25 Greetings!
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
26
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
27 I am Shehu Musa Abacha, cousin to the former
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
28 Nigerian dictator Sani Abacha.
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
29 EOF
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
30
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
31 hg commit -m '419 scam, with cousin'
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
32
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
33 #$ name: son
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
34
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
35 cd ..
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
36 hg clone scam scam-son
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
37 cd scam-son
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
38
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
39 cat > letter.txt <<EOF
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
40 Greetings!
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
41
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
42 I am Alhaji Abba Abacha, son of the former
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
43 Nigerian dictator Sani Abacha.
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
44 EOF
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
45
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
46 hg commit -m '419 scam, with son'
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
47
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
48 #$ name: pull
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
49
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
50 cd ..
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
51 hg clone scam-cousin scam-merge
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
52 cd scam-merge
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
53 hg pull -u ../scam-son
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
54
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
55 #$ name: merge
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
56
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
57 export HGMERGE=merge
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
58 hg merge
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
59 cat letter.txt
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
60
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
61 #$ name: commit
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
62
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
63 cat > letter.txt <<EOF
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
64 Greetings!
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
65
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
66 I am Bryan O'Sullivan, no relation of the former
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
67 Nigerian dictator Sani Abacha.
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
68 EOF
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
69
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
70 hg commit -m 'Send me your money'
5b80c922ebdd More merge content.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
71 hg tip