Mercurial > hgbook
comparison en/examples/tour @ 826:a17d6390a480
More fixes to chapters 1 and 2.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Sun, 03 May 2009 20:27:09 -0700 |
| parents | c8d662d3cb40 |
| children | 477d6a3e5023 |
comparison
equal
deleted
inserted
replaced
| 825:d7d09cda83d2 | 826:a17d6390a480 |
|---|---|
| 147 | 147 |
| 148 hg push http://hg.serpentine.com/tutorial/hello | 148 hg push http://hg.serpentine.com/tutorial/hello |
| 149 | 149 |
| 150 #$ name: | 150 #$ name: |
| 151 cp hello.c ../new-hello.c | 151 cp hello.c ../new-hello.c |
| 152 sed -i '/printf/i\\tprintf("once more, hello.\\n");' ../new-hello.c | 152 sed -i '/printf("hello,/i\\tprintf("once more, hello.\\n");' ../new-hello.c |
| 153 | 153 |
| 154 #$ name: merge.clone | 154 #$ name: merge.clone |
| 155 | 155 |
| 156 cd .. | 156 cd .. |
| 157 hg clone hello my-new-hello | 157 hg clone hello my-new-hello |
| 162 | 162 |
| 163 #$ name: merge.dummy2 | 163 #$ name: merge.dummy2 |
| 164 | 164 |
| 165 hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-new-hello | 165 hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-new-hello |
| 166 | 166 |
| 167 #$ name: merge.cat | 167 #$ name: merge.cat1 |
| 168 | 168 |
| 169 cat hello.c | 169 cat hello.c |
| 170 | |
| 171 #$ name: merge.cat2 | |
| 172 | |
| 170 cat ../my-hello/hello.c | 173 cat ../my-hello/hello.c |
| 171 | 174 |
| 172 #$ name: merge.pull | 175 #$ name: merge.pull |
| 173 | 176 |
| 174 hg pull ../my-hello | 177 hg pull ../my-hello |