Mercurial > hg > pyhgsh

comparison tests/test-merge1 @ 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 5b22029b5aa2
children ec85f9e6f3b1 8f5637f0a0c0 0902ffece4b4
comparison
equal deleted inserted replaced
748:c5df1a9c5276 749:7e4843b7efd2
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 -t "commit #0" -d "0 0" -u user 14 hg commit -m "commit #0" -d "0 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 -t "commit #1" -d "0 0" -u user 17 hg commit -m "commit #1" -d "0 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 -t "commit #2" -d "0 0" -u user 22 hg commit -m "commit #2" -d "0 0"
23 echo This is file b1 > b 23 echo This is file b1 > b
24 env HGMERGE=../merge hg update -m 1 24 env HGMERGE=../merge hg update -m 1
25 # no merges expected 25 # no merges expected
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 -t "commit #0" -d "0 0" -u user 33 hg commit -m "commit #0" -d "0 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 -t "commit #1" -d "0 0" -u user 36 hg commit -m "commit #1" -d "0 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 -t "commit #2" -d "0 0" -u user 41 hg commit -m "commit #2" -d "0 0"
42 echo This is file b2 > b 42 echo This is file b2 > b
43 env HGMERGE=../merge hg update -m 1 43 env HGMERGE=../merge hg update -m 1
44 # merge of b expected 44 # merge of b expected
45 cd ..; /bin/rm -rf t 45 cd ..; /bin/rm -rf t
46 46
47 mkdir t 47 mkdir t
48 cd t 48 cd t
49 hg init 49 hg init
50 echo This is file a1 > a 50 echo This is file a1 > a
51 hg add a 51 hg add a
52 hg commit -t "commit #0" -d "0 0" -u user 52 hg commit -m "commit #0" -d "0 0"
53 echo This is file b1 > b 53 echo This is file b1 > b
54 hg add b 54 hg add b
55 hg commit -t "commit #1" -d "0 0" -u user 55 hg commit -m "commit #1" -d "0 0"
56 echo This is file b22 > b 56 echo This is file b22 > b
57 hg commit -t "commit #2" -d "0 0" -u user 57 hg commit -m "commit #2" -d "0 0"
58 hg update 1 58 hg update 1
59 echo This is file c1 > c 59 echo This is file c1 > c
60 hg add c 60 hg add c
61 hg commit -t "commit #3" -d "0 0" -u user 61 hg commit -m "commit #3" -d "0 0"
62 cat b 62 cat b
63 echo This is file b22 > b 63 echo This is file b22 > b
64 env HGMERGE=../merge hg update -m 2 64 env HGMERGE=../merge hg update -m 2
65 # merge expected! 65 # merge expected!
66 cd ..; /bin/rm -rf t 66 cd ..; /bin/rm -rf t
68 mkdir t 68 mkdir t
69 cd t 69 cd t
70 hg init 70 hg init
71 echo This is file a1 > a 71 echo This is file a1 > a
72 hg add a 72 hg add a
73 hg commit -t "commit #0" -d "0 0" -u user 73 hg commit -m "commit #0" -d "0 0"
74 echo This is file b1 > b 74 echo This is file b1 > b
75 hg add b 75 hg add b
76 hg commit -t "commit #1" -d "0 0" -u user 76 hg commit -m "commit #1" -d "0 0"
77 echo This is file b22 > b 77 echo This is file b22 > b
78 hg commit -t "commit #2" -d "0 0" -u user 78 hg commit -m "commit #2" -d "0 0"
79 hg update 1 79 hg update 1
80 echo This is file c1 > c 80 echo This is file c1 > c
81 hg add c 81 hg add c
82 hg commit -t "commit #3" -d "0 0" -u user 82 hg commit -m "commit #3" -d "0 0"
83 echo This is file b33 > b 83 echo This is file b33 > b
84 env HGMERGE=../merge hg update -m 2 84 env HGMERGE=../merge hg update -m 2
85 # merge of b expected 85 # merge of b expected
86 cd ..; /bin/rm -rf t 86 cd ..; /bin/rm -rf t