Mercurial > hg

comparison tests/test-merge1 @ 1933:7544700fd931

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Some systems show "Thu Jan 01" instead of "Thu Jan 1", which breaks tests. Using "1000000" yields "Mon Jan 12 13:46:40 1970", which looks the same on all systems.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 13 Mar 2006 13:05:41 +0100
parents db10b7114de0
children e506c14382fd
comparison
equal deleted inserted replaced
1932:82995896d5af 1933:7544700fd931
9 mkdir t 9 mkdir t
10 cd t 10 cd t
11 hg init 11 hg init
12 echo This is file a1 > a 12 echo This is file a1 > a
13 hg add a 13 hg add a
14 hg commit -m "commit #0" -d "0 0" 14 hg commit -m "commit #0" -d "1000000 0"
15 echo This is file b1 > b 15 echo This is file b1 > b
16 hg add b 16 hg add b
17 hg commit -m "commit #1" -d "0 0" 17 hg commit -m "commit #1" -d "1000000 0"
18 18
19 hg update 0 19 hg update 0
20 echo This is file c1 > c 20 echo This is file c1 > c
21 hg add c 21 hg add c
22 hg commit -m "commit #2" -d "0 0" 22 hg commit -m "commit #2" -d "1000000 0"
23 echo This is file b1 > b 23 echo This is file b1 > b
24 echo %% no merges expected 24 echo %% no merges expected
25 env HGMERGE=../merge hg update -m 1 25 env HGMERGE=../merge hg update -m 1
26 cd ..; /bin/rm -rf t 26 cd ..; /bin/rm -rf t
27 27
28 mkdir t 28 mkdir t
29 cd t 29 cd t
30 hg init 30 hg init
31 echo This is file a1 > a 31 echo This is file a1 > a
32 hg add a 32 hg add a
33 hg commit -m "commit #0" -d "0 0" 33 hg commit -m "commit #0" -d "1000000 0"
34 echo This is file b1 > b 34 echo This is file b1 > b
35 hg add b 35 hg add b
36 hg commit -m "commit #1" -d "0 0" 36 hg commit -m "commit #1" -d "1000000 0"
37 37
38 hg update 0 38 hg update 0
39 echo This is file c1 > c 39 echo This is file c1 > c
40 hg add c 40 hg add c
41 hg commit -m "commit #2" -d "0 0" 41 hg commit -m "commit #2" -d "1000000 0"
42 echo This is file b2 > b 42 echo This is file b2 > b
43 echo %% merge should fail 43 echo %% merge should fail
44 env HGMERGE=../merge hg update -m 1 44 env HGMERGE=../merge hg update -m 1
45 echo %% merge of b expected 45 echo %% merge of b expected
46 env HGMERGE=../merge hg update -f -m 1 46 env HGMERGE=../merge hg update -f -m 1
50 mkdir t 50 mkdir t
51 cd t 51 cd t
52 hg init 52 hg init
53 echo This is file a1 > a 53 echo This is file a1 > a
54 hg add a 54 hg add a
55 hg commit -m "commit #0" -d "0 0" 55 hg commit -m "commit #0" -d "1000000 0"
56 echo This is file b1 > b 56 echo This is file b1 > b
57 hg add b 57 hg add b
58 hg commit -m "commit #1" -d "0 0" 58 hg commit -m "commit #1" -d "1000000 0"
59 echo This is file b22 > b 59 echo This is file b22 > b
60 hg commit -m "commit #2" -d "0 0" 60 hg commit -m "commit #2" -d "1000000 0"
61 hg update 1 61 hg update 1
62 echo This is file c1 > c 62 echo This is file c1 > c
63 hg add c 63 hg add c
64 hg commit -m "commit #3" -d "0 0" 64 hg commit -m "commit #3" -d "1000000 0"
65 65
66 echo 'Contents of b should be "this is file b1"' 66 echo 'Contents of b should be "this is file b1"'
67 cat b 67 cat b
68 68
69 echo This is file b22 > b 69 echo This is file b22 > b
76 mkdir t 76 mkdir t
77 cd t 77 cd t
78 hg init 78 hg init
79 echo This is file a1 > a 79 echo This is file a1 > a
80 hg add a 80 hg add a
81 hg commit -m "commit #0" -d "0 0" 81 hg commit -m "commit #0" -d "1000000 0"
82 echo This is file b1 > b 82 echo This is file b1 > b
83 hg add b 83 hg add b
84 hg commit -m "commit #1" -d "0 0" 84 hg commit -m "commit #1" -d "1000000 0"
85 echo This is file b22 > b 85 echo This is file b22 > b
86 hg commit -m "commit #2" -d "0 0" 86 hg commit -m "commit #2" -d "1000000 0"
87 hg update 1 87 hg update 1
88 echo This is file c1 > c 88 echo This is file c1 > c
89 hg add c 89 hg add c
90 hg commit -m "commit #3" -d "0 0" 90 hg commit -m "commit #3" -d "1000000 0"
91 echo This is file b33 > b 91 echo This is file b33 > b
92 echo %% merge of b should fail 92 echo %% merge of b should fail
93 env HGMERGE=../merge hg update -m 2 93 env HGMERGE=../merge hg update -m 2
94 echo %% merge of b expected 94 echo %% merge of b expected
95 env HGMERGE=../merge hg update -f -m 2 95 env HGMERGE=../merge hg update -f -m 2