Mercurial > hg

comparison tests/test-merge2 @ 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 ec85f9e6f3b1 8f5637f0a0c0 0902ffece4b4
comparison
equal deleted inserted replaced
748:c5df1a9c5276 749:7e4843b7efd2
3 mkdir t 3 mkdir t
4 cd t 4 cd t
5 hg init 5 hg init
6 echo This is file a1 > a 6 echo This is file a1 > a
7 hg add a 7 hg add a
8 hg commit -t "commit #0" -d "0 0" -u user 8 hg commit -m "commit #0" -d "0 0"
9 echo This is file b1 > b 9 echo This is file b1 > b
10 hg add b 10 hg add b
11 hg commit -t "commit #1" -d "0 0" -u user 11 hg commit -m "commit #1" -d "0 0"
12 rm b 12 rm b
13 hg update 0 13 hg update 0
14 echo This is file b2 > b 14 echo This is file b2 > b
15 hg add b 15 hg add b
16 hg commit -t "commit #2" -d "0 0" -u user 16 hg commit -m "commit #2" -d "0 0"
17 cd ..; /bin/rm -rf t 17 cd ..; /bin/rm -rf t
18 18
19 mkdir t 19 mkdir t
20 cd t 20 cd t
21 hg init 21 hg init
22 echo This is file a1 > a 22 echo This is file a1 > a
23 hg add a 23 hg add a
24 hg commit -t "commit #0" -d "0 0" -u user 24 hg commit -m "commit #0" -d "0 0"
25 echo This is file b1 > b 25 echo This is file b1 > b
26 hg add b 26 hg add b
27 hg commit -t "commit #1" -d "0 0" -u user 27 hg commit -m "commit #1" -d "0 0"
28 rm b 28 rm b
29 hg update 0 29 hg update 0
30 echo This is file b2 > b 30 echo This is file b2 > b
31 hg commit -A -t "commit #2" -d "0 0" -u user 31 hg commit -A -m "commit #2" -d "0 0"
32 cd ..; /bin/rm -rf t 32 cd ..; /bin/rm -rf t
33 33
34 mkdir t 34 mkdir t
35 cd t 35 cd t
36 hg init 36 hg init
37 echo This is file a1 > a 37 echo This is file a1 > a
38 hg add a 38 hg add a
39 hg commit -t "commit #0" -d "0 0" -u user 39 hg commit -m "commit #0" -d "0 0"
40 echo This is file b1 > b 40 echo This is file b1 > b
41 hg add b 41 hg add b
42 hg commit -t "commit #1" -d "0 0" -u user 42 hg commit -m "commit #1" -d "0 0"
43 rm b 43 rm b
44 hg remove b 44 hg remove b
45 hg update 0 45 hg update 0
46 echo This is file b2 > b 46 echo This is file b2 > b
47 hg commit -A -t "commit #2" -d "0 0" -u user 47 hg commit -A -m "commit #2" -d "0 0"
48 cd ..; /bin/rm -rf t 48 cd ..; /bin/rm -rf t