Mercurial > hgbook

annotate en/examples/hook.ws.better.out @ 395:e0b56f008b09

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix sample output for 'backout' test.
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed, 20 Aug 2008 21:51:54 +0200
parents 00f69e8825c5
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1 $ \textbf{cat .hg/hgrc}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2 [hooks]
150
8cf40d4d9377 Fix broken example.
Bryan O'Sullivan <bos@serpentine.com>
parents: 144
diff changeset
3 pretxncommit.whitespace = .hg/check_whitespace.py
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 $ \textbf{echo 'a ' >> a}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 $ \textbf{hg commit -A -m 'add new line with trailing whitespace'}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 a, line 2: trailing whitespace added
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 commit message saved to .hg/commit.save
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 transaction abort!
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9 rollback completed
273
00f69e8825c5 Bring book up to date with recent changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 165
diff changeset
10 abort: pretxncommit.whitespace hook exited with status 1
165
06d18465df03 Make an example run more predictably.
Bryan O'Sullivan <bos@serpentine.com>
parents: 150
diff changeset
11 $ \textbf{sed -i 's, *$,,' a}
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
12 $ \textbf{hg commit -A -m 'trimmed trailing whitespace'}
165
06d18465df03 Make an example run more predictably.
Bryan O'Sullivan <bos@serpentine.com>
parents: 150
diff changeset
13 a, line 2: trailing whitespace added
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
14 commit message saved to .hg/commit.save
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
15 transaction abort!
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
16 rollback completed
273
00f69e8825c5 Bring book up to date with recent changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 165
diff changeset
17 abort: pretxncommit.whitespace hook exited with status 1