Mercurial > hgbook
annotate es/examples/mq.dodiff @ 794:41bb6ec2ca27
Propagate c36a6f534b99
Fix named branching book section.
'hg update -C branchname' is no longer required to jump from one named
branch to another one; this can also be done simply using 'hg update
branchname'.
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Thu, 18 Jun 2009 16:23:58 +0900 |
parents | 04c08ad7e92e |
children |
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 |