hgbook
annotate en/examples/tour-merge-conflict @ 1007:f4f740bb58be
merge with William and Frédéric
| author | Romain PELISSE <belaran@gmail.com> |
|---|---|
| date | Tue Sep 15 13:43:02 2009 +0200 (2009-09-15) |
| parents | bc14f94e726a |
| children |
| rev | line source |
|---|---|
| bos@103 | 1 #!/bin/bash |
| bos@103 | 2 |
| bos@103 | 3 hg init scam |
| bos@103 | 4 cd scam |
| bos@103 | 5 |
| bos@103 | 6 #$ name: wife |
| bos@103 | 7 |
| bos@103 | 8 cat > letter.txt <<EOF |
| bos@103 | 9 Greetings! |
| bos@103 | 10 |
| bos@103 | 11 I am Mariam Abacha, the wife of former |
| bos@103 | 12 Nigerian dictator Sani Abacha. |
| bos@103 | 13 EOF |
| bos@103 | 14 |
| bos@103 | 15 hg add letter.txt |
| bos@103 | 16 hg commit -m '419 scam, first draft' |
| bos@103 | 17 |
| bos@103 | 18 #$ name: cousin |
| bos@103 | 19 |
| bos@103 | 20 cd .. |
| bos@103 | 21 hg clone scam scam-cousin |
| bos@103 | 22 cd scam-cousin |
| bos@103 | 23 |
| bos@103 | 24 cat > letter.txt <<EOF |
| bos@103 | 25 Greetings! |
| bos@103 | 26 |
| bos@103 | 27 I am Shehu Musa Abacha, cousin to the former |
| bos@103 | 28 Nigerian dictator Sani Abacha. |
| bos@103 | 29 EOF |
| bos@103 | 30 |
| bos@103 | 31 hg commit -m '419 scam, with cousin' |
| bos@103 | 32 |
| bos@103 | 33 #$ name: son |
| bos@103 | 34 |
| bos@103 | 35 cd .. |
| bos@103 | 36 hg clone scam scam-son |
| bos@103 | 37 cd scam-son |
| bos@103 | 38 |
| bos@103 | 39 cat > letter.txt <<EOF |
| bos@103 | 40 Greetings! |
| bos@103 | 41 |
| bos@103 | 42 I am Alhaji Abba Abacha, son of the former |
| bos@103 | 43 Nigerian dictator Sani Abacha. |
| bos@103 | 44 EOF |
| bos@103 | 45 |
| bos@103 | 46 hg commit -m '419 scam, with son' |
| bos@103 | 47 |
| bos@103 | 48 #$ name: pull |
| bos@103 | 49 |
| bos@103 | 50 cd .. |
| bos@103 | 51 hg clone scam-cousin scam-merge |
| bos@103 | 52 cd scam-merge |
| bos@103 | 53 hg pull -u ../scam-son |
| bos@103 | 54 |
| bos@103 | 55 #$ name: merge |
| bos@139 | 56 #$ ignore: [<>]{7} /tmp/.* |
| bos@103 | 57 |
| bos@103 | 58 export HGMERGE=merge |
| bos@103 | 59 hg merge |
| bos@103 | 60 cat letter.txt |
| bos@103 | 61 |
| bos@103 | 62 #$ name: commit |
| bos@103 | 63 |
| bos@103 | 64 cat > letter.txt <<EOF |
| bos@103 | 65 Greetings! |
| bos@103 | 66 |
| bos@103 | 67 I am Bryan O'Sullivan, no relation of the former |
| bos@103 | 68 Nigerian dictator Sani Abacha. |
| bos@103 | 69 EOF |
| bos@103 | 70 |
| hg@302 | 71 hg resolve -m letter.txt |
| bos@103 | 72 hg commit -m 'Send me your money' |
| bos@103 | 73 hg tip |