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 Jul 23 23:38:18 2006 -0700 (2006-07-23) |
parents | 6b7b0339e7d6 |
children | 6f37e6a7d8cd |
files | en/Makefile en/examples/mq.diff en/examples/mq.dodiff en/mq.tex |
line diff
1.1 --- a/en/Makefile Sun Jul 23 23:34:24 2006 -0700 1.2 +++ b/en/Makefile Sun Jul 23 23:38:18 2006 -0700 1.3 @@ -21,7 +21,7 @@ 1.4 examples/hook.simple \ 1.5 examples/hook.ws \ 1.6 examples/mq.qinit-help \ 1.7 - examples/mq.diff \ 1.8 + examples/mq.dodiff \ 1.9 examples/mq.tarball \ 1.10 examples/mq.tools \ 1.11 examples/mq.tutorial 1.12 @@ -121,4 +121,4 @@ 1.13 1.14 clean: 1.15 rm -rf beta html pdf *.eps *.pdf *.png *.aux *.dvi *.log *.out \ 1.16 - examples/*.out examples/.run build_id.tex 1.17 + examples/*.{out,run} examples/.run build_id.tex
2.1 --- a/en/examples/mq.diff Sun Jul 23 23:34:24 2006 -0700 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,12 +0,0 @@ 2.4 -#$ name: diff 2.5 - 2.6 -echo 'this is my first line' > oldfile 2.7 -echo 'my first line is here' > newfile 2.8 - 2.9 -diff -u oldfile newfile > tiny.patch 2.10 - 2.11 -cat tiny.patch 2.12 - 2.13 -patch < tiny.patch 2.14 - 2.15 -cat newfile
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/en/examples/mq.dodiff Sun Jul 23 23:38:18 2006 -0700 3.3 @@ -0,0 +1,14 @@ 3.4 +#!/bin/bash 3.5 + 3.6 +#$ name: diff 3.7 + 3.8 +echo 'this is my first line' > oldfile 3.9 +echo 'my first line is here' > newfile 3.10 + 3.11 +diff -u oldfile newfile > tiny.patch 3.12 + 3.13 +cat tiny.patch 3.14 + 3.15 +patch < tiny.patch 3.16 + 3.17 +cat newfile
4.1 --- a/en/mq.tex Sun Jul 23 23:34:24 2006 -0700 4.2 +++ b/en/mq.tex Sun Jul 23 23:38:18 2006 -0700 4.3 @@ -141,7 +141,7 @@ 4.4 these commands in action. 4.5 4.6 \begin{figure}[ht] 4.7 - \interaction{mq.diff.diff} 4.8 + \interaction{mq.dodiff.diff} 4.9 \caption{Simple uses of the \command{diff} and \command{patch} commands} 4.10 \label{ex:mq:diff} 4.11 \end{figure}