Mercurial > hgbook
comparison en/examples/tour @ 718:4e23c220d1b0
Update chapter 2
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Mon, 06 Apr 2009 22:05:44 -0700 |
| parents | c44d5854620b |
| children | c8d662d3cb40 |
comparison
equal
deleted
inserted
replaced
| 717:2b193ab0df9a | 718:4e23c220d1b0 |
|---|---|
| 144 | 144 |
| 145 #$ name: push.net | 145 #$ name: push.net |
| 146 | 146 |
| 147 hg push http://hg.serpentine.com/tutorial/hello | 147 hg push http://hg.serpentine.com/tutorial/hello |
| 148 | 148 |
| 149 #$ name: | |
| 150 cp hello.c ../new-hello.c | |
| 151 sed -i '/printf/i\\tprintf("once more, hello.\\n");' ../new-hello.c | |
| 152 | |
| 149 #$ name: merge.clone | 153 #$ name: merge.clone |
| 150 | 154 |
| 151 cd .. | 155 cd .. |
| 152 hg clone hello my-new-hello | 156 hg clone hello my-new-hello |
| 153 cd my-new-hello | 157 cd my-new-hello |
| 154 sed -i '/printf/i\\tprintf("once more, hello.\\n");' hello.c | 158 # The file new-hello.c is lightly edited. |
| 159 cp ../new-hello.c hello.c | |
| 155 hg commit -m 'A new hello for a new day.' | 160 hg commit -m 'A new hello for a new day.' |
| 156 | 161 |
| 157 #$ name: merge.dummy2 | 162 #$ name: merge.dummy2 |
| 158 | 163 |
| 159 hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-new-hello | 164 hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-new-hello |