Mercurial > hgbook

annotate en/examples/mq.dodiff @ 72:12df31afb4e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Propagate exceptions more correctly.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 29 Aug 2006 22:34:03 -0700
parents dd657c4d3a47
children f2061ece8ed9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
46
dd657c4d3a47 Rename mq.diff to mq.dodiff Emacs won't screw up the syntax highlighting.
Bryan O'Sullivan <bos@serpentine.com>
parents: 36
diff changeset
1 #!/bin/bash
dd657c4d3a47 Rename mq.diff to mq.dodiff Emacs won't screw up the syntax highlighting.
Bryan O'Sullivan <bos@serpentine.com>
parents: 36
diff changeset
2
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 #$ name: diff
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 echo 'this is my first line' > oldfile
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 echo 'my first line is here' > newfile
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 diff -u oldfile newfile > tiny.patch
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10 cat tiny.patch
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
11
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
12 patch < tiny.patch
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
13
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
14 cat newfile