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