Mercurial > hgbook

annotate en/examples/mq.dodiff @ 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 cac3ac4536e5
children
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
288
cac3ac4536e5 Better wording, again per Jim Blandy.
Bryan O'Sullivan <bos@serpentine.com>
parents: 252
diff changeset
5 echo 'this is my original thought' > oldfile
cac3ac4536e5 Better wording, again per Jim Blandy.
Bryan O'Sullivan <bos@serpentine.com>
parents: 252
diff changeset
6 echo 'i have changed my mind' > newfile
19
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
252
f2061ece8ed9 Fix file printed in first MQ "understanding patches" example
Alexandre Perrin <makoto.kaworu@gmail.com>
parents: 46
diff changeset
14 cat oldfile