Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge1.out @ 808:8f5637f0a0c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with TAH
author mpm@selenic.com
date Sat, 30 Jul 2005 08:35:29 -0800
parents 7e4843b7efd2 1f9ec150a476
children 0902ffece4b4
comparison
equal deleted inserted replaced
788:64d2a558c943 808:8f5637f0a0c0
1 + cat
2 + chmod +x merge
3 + mkdir t
4 + cd t
5 + hg init 1 + hg init
6 + echo This is file a1
7 + hg add a 2 + hg add a
8 + hg commit -m 'commit #0' -d '0 0' 3 + hg commit -m commit #0 -d 0 0
9 + echo This is file b1
10 + hg add b 4 + hg add b
11 + hg commit -m 'commit #1' -d '0 0' 5 + hg commit -m commit #1 -d 0 0
12 + hg update 0 6 + hg update 0
13 + echo This is file c1
14 + hg add c 7 + hg add c
15 + hg commit -m 'commit #2' -d '0 0' 8 + hg commit -m commit #2 -d 0 0
16 + echo This is file b1 9 + hg update -m 1
17 + env HGMERGE=../merge hg update -m 1
18 + cd ..
19 + /bin/rm -rf t
20 + mkdir t
21 + cd t
22 + hg init 10 + hg init
23 + echo This is file a1
24 + hg add a 11 + hg add a
25 + hg commit -m 'commit #0' -d '0 0' 12 + hg commit -m commit #0 -d 0 0
26 + echo This is file b1
27 + hg add b 13 + hg add b
28 + hg commit -m 'commit #1' -d '0 0' 14 + hg commit -m commit #1 -d 0 0
29 + hg update 0 15 + hg update 0
30 + echo This is file c1
31 + hg add c 16 + hg add c
32 + hg commit -m 'commit #2' -d '0 0' 17 + hg commit -m commit #2 -d 0 0
33 + echo This is file b2 18 + hg update -m 1
34 + env HGMERGE=../merge hg update -m 1
35 merging for b 19 merging for b
36 merging b 20 merging b
37 + cd ..
38 + /bin/rm -rf t
39 + mkdir t
40 + cd t
41 + hg init 21 + hg init
42 + echo This is file a1
43 + hg add a 22 + hg add a
44 + hg commit -m 'commit #0' -d '0 0' 23 + hg commit -m commit #0 -d 0 0
45 + echo This is file b1
46 + hg add b 24 + hg add b
47 + hg commit -m 'commit #1' -d '0 0' 25 + hg commit -m commit #1 -d 0 0
48 + echo This is file b22 26 + hg commit -m commit #2 -d 0 0
49 + hg commit -m 'commit #2' -d '0 0'
50 + hg update 1 27 + hg update 1
51 + echo This is file c1
52 + hg add c 28 + hg add c
53 + hg commit -m 'commit #3' -d '0 0' 29 + hg commit -m commit #3 -d 0 0
54 + cat b
55 This is file b1 30 This is file b1
56 + echo This is file b22 31 + hg update -m 2
57 + env HGMERGE=../merge hg update -m 2
58 merging for b 32 merging for b
59 merging b 33 merging b
60 + cd ..
61 + /bin/rm -rf t
62 + mkdir t
63 + cd t
64 + hg init 34 + hg init
65 + echo This is file a1
66 + hg add a 35 + hg add a
67 + hg commit -m 'commit #0' -d '0 0' 36 + hg commit -m commit #0 -d 0 0
68 + echo This is file b1
69 + hg add b 37 + hg add b
70 + hg commit -m 'commit #1' -d '0 0' 38 + hg commit -m commit #1 -d 0 0
71 + echo This is file b22 39 + hg commit -m commit #2 -d 0 0
72 + hg commit -m 'commit #2' -d '0 0'
73 + hg update 1 40 + hg update 1
74 + echo This is file c1
75 + hg add c 41 + hg add c
76 + hg commit -m 'commit #3' -d '0 0' 42 + hg commit -m commit #3 -d 0 0
77 + echo This is file b33 43 + hg update -m 2
78 + env HGMERGE=../merge hg update -m 2
79 merging for b 44 merging for b
80 merging b 45 merging b
81 + cd ..
82 + /bin/rm -rf t