hgbook

view fr/examples/tour-merge-conflict @ 1114:527b86d55d4a

find changesets by author, revision, files, or words in the commit message
inotify: update installation information

inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Sun Dec 13 16:35:56 2009 +0900 (2009-12-13)
parents 4e23c220d1b0 547d3aa25ef0
children
line source
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
56 #$ ignore: [<>]{7} /tmp/.*
57
58 export HGMERGE=merge
59 hg merge
60 cat letter.txt
61
62 #$ name: commit
63
64 cat > letter.txt <<EOF
65 Greetings!
66
67 I am Bryan O'Sullivan, no relation of the former
68 Nigerian dictator Sani Abacha.
69 EOF
70
71 hg resolve -m letter.txt
72 hg commit -m 'Send me your money'
73 hg tip