Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge6 @ 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 d96c1153b25d
children ec85f9e6f3b1 8f5637f0a0c0 0902ffece4b4
comparison
equal deleted inserted replaced
748:c5df1a9c5276 749:7e4843b7efd2
11 cd A1 11 cd A1
12 hg init 12 hg init
13 echo This is file foo1 > foo 13 echo This is file foo1 > foo
14 echo This is file bar1 > bar 14 echo This is file bar1 > bar
15 hg add foo bar 15 hg add foo bar
16 hg commit -t "commit text" -d "0 0" -u user 16 hg commit -m "commit text" -d "0 0"
17 17
18 cd .. 18 cd ..
19 hg clone A1 B1 19 hg clone A1 B1
20 20
21 cd A1 21 cd A1
22 rm bar 22 rm bar
23 hg remove bar 23 hg remove bar
24 hg commit -t "commit test" -d "0 0" -u user 24 hg commit -m "commit test" -d "0 0"
25 25
26 cd ../B1 26 cd ../B1
27 echo This is file foo22 > foo 27 echo This is file foo22 > foo
28 hg commit -t "commit test" -d "0 0" -u user 28 hg commit -m "commit test" -d "0 0"
29 29
30 cd .. 30 cd ..
31 hg clone A1 A2 31 hg clone A1 A2
32 hg clone B1 B2 32 hg clone B1 B2
33 33
34 cd A1 34 cd A1
35 hg pull ../B1 35 hg pull ../B1
36 hg update -m 36 hg update -m
37 hg commit -t "commit test" -d "0 0" -u user 37 hg commit -m "commit test" -d "0 0"
38 echo bar should remain deleted. 38 echo bar should remain deleted.
39 hg manifest 39 hg manifest
40 40
41 cd ../B2 41 cd ../B2
42 hg pull ../A2 42 hg pull ../A2
43 hg update -m 43 hg update -m
44 hg commit -t "commit test" -d "0 0" -u user 44 hg commit -m "commit test" -d "0 0"
45 echo bar should remain deleted. 45 echo bar should remain deleted.
46 hg manifest 46 hg manifest