annotate en/examples/hook.ws.better.out @ 275:96ea24a916f9
Merge with myself.
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Mon Nov 26 20:42:36 2007 -0800 (2007-11-26) |
| parents |
06d18465df03 |
| children |
|
| rev |
line source |
|
bos@144
|
1 $ \textbf{cat .hg/hgrc}
|
|
bos@144
|
2 [hooks]
|
|
bos@150
|
3 pretxncommit.whitespace = .hg/check_whitespace.py
|
|
bos@144
|
4 $ \textbf{echo 'a ' >> a}
|
|
bos@144
|
5 $ \textbf{hg commit -A -m 'add new line with trailing whitespace'}
|
|
bos@144
|
6 a, line 2: trailing whitespace added
|
|
bos@144
|
7 commit message saved to .hg/commit.save
|
|
bos@144
|
8 transaction abort!
|
|
bos@144
|
9 rollback completed
|
|
bos@273
|
10 abort: pretxncommit.whitespace hook exited with status 1
|
|
bos@165
|
11 $ \textbf{sed -i 's, *$,,' a}
|
|
bos@144
|
12 $ \textbf{hg commit -A -m 'trimmed trailing whitespace'}
|
|
bos@165
|
13 a, line 2: trailing whitespace added
|
|
bos@144
|
14 commit message saved to .hg/commit.save
|
|
bos@144
|
15 transaction abort!
|
|
bos@144
|
16 rollback completed
|
|
bos@273
|
17 abort: pretxncommit.whitespace hook exited with status 1
|
