Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge2.out @ 409:feadc9697b43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Pick up tests from previous patch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Pick up tests from previous patch manifest hash: 3ec4c3cb96e15322f7489d89b7b92ee214f6cfb9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNIaywK+sNU5EO8RAuGOAJ9YXXfXstC6wysknsXPAL9jDeiUDwCgpFJ3 P5goy7Zw3ypinBEwZrhgXM8= =6fKs -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 21 Jun 2005 18:51:06 -0800
parents
children 7e4843b7efd2
comparison
equal deleted inserted replaced
408:3695fbd2c33b 409:feadc9697b43
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