Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge2.out @ 508:42a660abaf75
[PATCH] Harden os.system
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Harden os.system
From: Bryan O'Sullivan <bos@serpentine.com>
Add util.system function. This is similar to os.system, but will
either succeed (if the process finishes with a zero exit code) or raise
a util.CommandError (if the process exits uncleanly or is killed by
a signal).
Add util.explain_exit function. This tends to be ubiquitous in code
that calls other processes, and must describe what has gone wrong.
Change some uses of os.system over to util.system.
manifest hash: e3bf4adcac5b915432ec0af00efdbcef86bea4b1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCwSipywK+sNU5EO8RAr0RAJkBDt8XQ7mYQAWNHNgTOVt1eyWU1QCfe1oO
2OwxyWqpbRNACVJHHfZ3/Xw=
=OaRX
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 28 Jun 2005 02:38:33 -0800 |
parents | feadc9697b43 |
children | 7e4843b7efd2 |
rev | line source |
---|---|
409 | 1 + mkdir t |
2 + cd t | |
3 + hg init | |
4 + echo This is file a1 | |
5 + hg add a | |
6 + hg commit -t 'commit #0' -d '0 0' -u user | |
7 + echo This is file b1 | |
8 + hg add b | |
9 + hg commit -t 'commit #1' -d '0 0' -u user | |
10 + rm b | |
11 + hg update 0 | |
12 + echo This is file b2 | |
13 + hg add b | |
14 + hg commit -t 'commit #2' -d '0 0' -u user | |
15 + cd .. | |
16 + /bin/rm -rf t | |
17 + mkdir t | |
18 + cd t | |
19 + hg init | |
20 + echo This is file a1 | |
21 + hg add a | |
22 + hg commit -t 'commit #0' -d '0 0' -u user | |
23 + echo This is file b1 | |
24 + hg add b | |
25 + hg commit -t 'commit #1' -d '0 0' -u user | |
26 + rm b | |
27 + hg update 0 | |
28 + echo This is file b2 | |
29 + hg commit -A -t 'commit #2' -d '0 0' -u user | |
30 + cd .. | |
31 + /bin/rm -rf t | |
32 + mkdir t | |
33 + cd t | |
34 + hg init | |
35 + echo This is file a1 | |
36 + hg add a | |
37 + hg commit -t 'commit #0' -d '0 0' -u user | |
38 + echo This is file b1 | |
39 + hg add b | |
40 + hg commit -t 'commit #1' -d '0 0' -u user | |
41 + rm b | |
42 + hg remove b | |
43 + hg update 0 | |
44 + echo This is file b2 | |
45 + hg commit -A -t 'commit #2' -d '0 0' -u user | |
46 + cd .. | |
47 + /bin/rm -rf t |