Mercurial > hgbook
changeset 46:dd657c4d3a47
Rename mq.diff to mq.dodiff Emacs won't screw up the syntax highlighting.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Sun, 23 Jul 2006 23:38:18 -0700 |
| parents | 6b7b0339e7d6 |
| children | 6f37e6a7d8cd |
| files | en/Makefile en/examples/mq.diff en/examples/mq.dodiff en/mq.tex |
| diffstat | 4 files changed, 17 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/en/Makefile Sun Jul 23 23:34:24 2006 -0700 +++ b/en/Makefile Sun Jul 23 23:38:18 2006 -0700 @@ -21,7 +21,7 @@ examples/hook.simple \ examples/hook.ws \ examples/mq.qinit-help \ - examples/mq.diff \ + examples/mq.dodiff \ examples/mq.tarball \ examples/mq.tools \ examples/mq.tutorial @@ -121,4 +121,4 @@ clean: rm -rf beta html pdf *.eps *.pdf *.png *.aux *.dvi *.log *.out \ - examples/*.out examples/.run build_id.tex + examples/*.{out,run} examples/.run build_id.tex
--- a/en/examples/mq.diff Sun Jul 23 23:34:24 2006 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -#$ name: diff - -echo 'this is my first line' > oldfile -echo 'my first line is here' > newfile - -diff -u oldfile newfile > tiny.patch - -cat tiny.patch - -patch < tiny.patch - -cat newfile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/examples/mq.dodiff Sun Jul 23 23:38:18 2006 -0700 @@ -0,0 +1,14 @@ +#!/bin/bash + +#$ name: diff + +echo 'this is my first line' > oldfile +echo 'my first line is here' > newfile + +diff -u oldfile newfile > tiny.patch + +cat tiny.patch + +patch < tiny.patch + +cat newfile
--- a/en/mq.tex Sun Jul 23 23:34:24 2006 -0700 +++ b/en/mq.tex Sun Jul 23 23:38:18 2006 -0700 @@ -141,7 +141,7 @@ these commands in action. \begin{figure}[ht] - \interaction{mq.diff.diff} + \interaction{mq.dodiff.diff} \caption{Simple uses of the \command{diff} and \command{patch} commands} \label{ex:mq:diff} \end{figure}