Mercurial > hgbook
comparison en/examples/tour @ 828:477d6a3e5023
Many final changes.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 04 May 2009 23:52:38 -0700 |
parents | a17d6390a480 |
children |
comparison
equal
deleted
inserted
replaced
827:d2aacc06e562 | 828:477d6a3e5023 |
---|---|
149 | 149 |
150 #$ name: | 150 #$ name: |
151 cp hello.c ../new-hello.c | 151 cp hello.c ../new-hello.c |
152 sed -i '/printf("hello,/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 my-text-editor() | |
155 { | |
156 cp ../new-hello.c hello.c | |
157 } | |
158 | |
154 #$ name: merge.clone | 159 #$ name: merge.clone |
155 | 160 |
156 cd .. | 161 cd .. |
157 hg clone hello my-new-hello | 162 hg clone hello my-new-hello |
158 cd my-new-hello | 163 cd my-new-hello |
159 # The file new-hello.c is lightly edited. | 164 # Make some simple edits to hello.c. |
160 cp ../new-hello.c hello.c | 165 my-text-editor hello.c |
161 hg commit -m 'A new hello for a new day.' | 166 hg commit -m 'A new hello for a new day.' |
162 | 167 |
163 #$ name: merge.dummy2 | 168 #$ name: merge.dummy2 |
164 | 169 |
165 hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-new-hello | 170 hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-new-hello |