hgbook
annotate en/examples/mq.dodiff @ 647:d0160b0b1a9e
Merge with http://hg.serpentine.com/mercurial/book
| author | Dongsheng Song <dongsheng.song@gmail.com> |
|---|---|
| date | Wed Mar 18 20:32:37 2009 +0800 (2009-03-18) |
| parents | f2061ece8ed9 |
| children |
| rev | line source |
|---|---|
| bos@46 | 1 #!/bin/bash |
| bos@46 | 2 |
| bos@19 | 3 #$ name: diff |
| bos@19 | 4 |
| bos@288 | 5 echo 'this is my original thought' > oldfile |
| bos@288 | 6 echo 'i have changed my mind' > newfile |
| bos@19 | 7 |
| bos@19 | 8 diff -u oldfile newfile > tiny.patch |
| bos@19 | 9 |
| bos@19 | 10 cat tiny.patch |
| bos@19 | 11 |
| bos@19 | 12 patch < tiny.patch |
| bos@19 | 13 |
| makoto@252 | 14 cat oldfile |