hgbook
annotate es/examples/mq.dodiff @ 495:dfa2890d9b30
translated most of section 13.8
| author | Javier Rojas <jerojasro@devnull.li> |
|---|---|
| date | Wed Jan 07 23:38:40 2009 -0500 (2009-01-07) |
| parents | |
| children |
| rev | line source |
|---|---|
| igor@333 | 1 #!/bin/bash |
| igor@333 | 2 |
| igor@333 | 3 #$ name: diff |
| igor@333 | 4 |
| igor@333 | 5 echo 'this is my original thought' > oldfile |
| igor@333 | 6 echo 'i have changed my mind' > newfile |
| igor@333 | 7 |
| igor@333 | 8 diff -u oldfile newfile > tiny.patch |
| igor@333 | 9 |
| igor@333 | 10 cat tiny.patch |
| igor@333 | 11 |
| igor@333 | 12 patch < tiny.patch |
| igor@333 | 13 |
| igor@333 | 14 cat oldfile |