Mercurial > hgbook

annotate en/examples/mq.dodiff.diff.out @ 530:f809de31887a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more translation :D added a term to the glossary
author jerojasro@localhost
date Sun, 30 Nov 2008 18:41:51 -0500
parents 7be02466421b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
289
7be02466421b Oops, forgot to update the output
Bryan O'Sullivan <bos@serpentine.com>
parents: 253
diff changeset
1 $ \textbf{echo 'this is my original thought' > oldfile}
7be02466421b Oops, forgot to update the output
Bryan O'Sullivan <bos@serpentine.com>
parents: 253
diff changeset
2 $ \textbf{echo 'i have changed my mind' > newfile}
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 $ \textbf{diff -u oldfile newfile > tiny.patch}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 $ \textbf{cat tiny.patch}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 @@ -1 +1 @@
289
7be02466421b Oops, forgot to update the output
Bryan O'Sullivan <bos@serpentine.com>
parents: 253
diff changeset
8 -this is my original thought
7be02466421b Oops, forgot to update the output
Bryan O'Sullivan <bos@serpentine.com>
parents: 253
diff changeset
9 +i have changed my mind
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10 $ \textbf{patch < tiny.patch}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
11 patching file oldfile
253
bdd271cf1ae1 Update expected output.
Bryan O'Sullivan <bos@serpentine.com>
parents: 144
diff changeset
12 $ \textbf{cat oldfile}
289
7be02466421b Oops, forgot to update the output
Bryan O'Sullivan <bos@serpentine.com>
parents: 253
diff changeset
13 i have changed my mind