Mercurial > hgbook

annotate es/examples/mq.dodiff @ 834:896ab6eaf1c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Fri, 10 Jul 2009 02:32:17 +0900
parents 04c08ad7e92e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
432
04c08ad7e92e Translated svgs dummy .tex towards building
Igor TAmara <igor@tamarapatino.org>
parents:
diff changeset
1 #!/bin/bash
04c08ad7e92e Translated svgs dummy .tex towards building
Igor TAmara <igor@tamarapatino.org>
parents:
diff changeset
2
04c08ad7e92e Translated svgs dummy .tex towards building
Igor TAmara <igor@tamarapatino.org>
parents:
diff changeset
3 #$ name: diff
04c08ad7e92e Translated svgs dummy .tex towards building
Igor TAmara <igor@tamarapatino.org>
parents:
diff changeset
4
04c08ad7e92e Translated svgs dummy .tex towards building
Igor TAmara <igor@tamarapatino.org>
parents:
diff changeset
5 echo 'this is my original thought' > oldfile
04c08ad7e92e Translated svgs dummy .tex towards building
Igor TAmara <igor@tamarapatino.org>
parents:
diff changeset
6 echo 'i have changed my mind' > newfile
04c08ad7e92e Translated svgs dummy .tex towards building
Igor TAmara <igor@tamarapatino.org>
parents:
diff changeset
7
04c08ad7e92e Translated svgs dummy .tex towards building
Igor TAmara <igor@tamarapatino.org>
parents:
diff changeset
8 diff -u oldfile newfile > tiny.patch
04c08ad7e92e Translated svgs dummy .tex towards building
Igor TAmara <igor@tamarapatino.org>
parents:
diff changeset
9
04c08ad7e92e Translated svgs dummy .tex towards building
Igor TAmara <igor@tamarapatino.org>
parents:
diff changeset
10 cat tiny.patch
04c08ad7e92e Translated svgs dummy .tex towards building
Igor TAmara <igor@tamarapatino.org>
parents:
diff changeset
11
04c08ad7e92e Translated svgs dummy .tex towards building
Igor TAmara <igor@tamarapatino.org>
parents:
diff changeset
12 patch < tiny.patch
04c08ad7e92e Translated svgs dummy .tex towards building
Igor TAmara <igor@tamarapatino.org>
parents:
diff changeset
13
04c08ad7e92e Translated svgs dummy .tex towards building
Igor TAmara <igor@tamarapatino.org>
parents:
diff changeset
14 cat oldfile