Mercurial > hg > pyhgsh

comparison tests/test-merge2.out @ 749:7e4843b7efd2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update tests to use commit -m and default -u manifest hash: 6e4385453843031a712005a320d6000595b40d05
author mpm@selenic.com
date Thu, 21 Jul 2005 15:05:17 -0500
parents feadc9697b43
children 61ed30e82b27
comparison
equal deleted inserted replaced
748:c5df1a9c5276 749:7e4843b7efd2
1 + mkdir t 1 + mkdir t
2 + cd t 2 + cd t
3 + hg init 3 + hg init
4 + echo This is file a1 4 + echo This is file a1
5 + hg add a 5 + hg add a
6 + hg commit -t 'commit #0' -d '0 0' -u user 6 + hg commit -m 'commit #0' -d '0 0'
7 + echo This is file b1 7 + echo This is file b1
8 + hg add b 8 + hg add b
9 + hg commit -t 'commit #1' -d '0 0' -u user 9 + hg commit -m 'commit #1' -d '0 0'
10 + rm b 10 + rm b
11 + hg update 0 11 + hg update 0
12 + echo This is file b2 12 + echo This is file b2
13 + hg add b 13 + hg add b
14 + hg commit -t 'commit #2' -d '0 0' -u user 14 + hg commit -m 'commit #2' -d '0 0'
15 + cd .. 15 + cd ..
16 + /bin/rm -rf t 16 + /bin/rm -rf t
17 + mkdir t 17 + mkdir t
18 + cd t 18 + cd t
19 + hg init 19 + hg init
20 + echo This is file a1 20 + echo This is file a1
21 + hg add a 21 + hg add a
22 + hg commit -t 'commit #0' -d '0 0' -u user 22 + hg commit -m 'commit #0' -d '0 0'
23 + echo This is file b1 23 + echo This is file b1
24 + hg add b 24 + hg add b
25 + hg commit -t 'commit #1' -d '0 0' -u user 25 + hg commit -m 'commit #1' -d '0 0'
26 + rm b 26 + rm b
27 + hg update 0 27 + hg update 0
28 + echo This is file b2 28 + echo This is file b2
29 + hg commit -A -t 'commit #2' -d '0 0' -u user 29 + hg commit -A -m 'commit #2' -d '0 0'
30 + cd .. 30 + cd ..
31 + /bin/rm -rf t 31 + /bin/rm -rf t
32 + mkdir t 32 + mkdir t
33 + cd t 33 + cd t
34 + hg init 34 + hg init
35 + echo This is file a1 35 + echo This is file a1
36 + hg add a 36 + hg add a
37 + hg commit -t 'commit #0' -d '0 0' -u user 37 + hg commit -m 'commit #0' -d '0 0'
38 + echo This is file b1 38 + echo This is file b1
39 + hg add b 39 + hg add b
40 + hg commit -t 'commit #1' -d '0 0' -u user 40 + hg commit -m 'commit #1' -d '0 0'
41 + rm b 41 + rm b
42 + hg remove b 42 + hg remove b
43 + hg update 0 43 + hg update 0
44 + echo This is file b2 44 + echo This is file b2
45 + hg commit -A -t 'commit #2' -d '0 0' -u user 45 + hg commit -A -m 'commit #2' -d '0 0'
46 + cd .. 46 + cd ..
47 + /bin/rm -rf t 47 + /bin/rm -rf t