616
|
1 #!/bin/sh -x
|
|
2
|
|
3 cat <<'EOF' > merge
|
|
4 #!/bin/sh
|
|
5 echo merging for `basename $1`
|
|
6 EOF
|
|
7 chmod +x merge
|
|
8 export HGMERGE=./merge
|
|
9
|
|
10 mkdir A1
|
|
11 cd A1
|
|
12 hg init
|
|
13 echo This is file foo1 > foo
|
|
14 echo This is file bar1 > bar
|
|
15 hg add foo bar
|
|
16 hg commit -t "commit text" -d "0 0" -u user
|
|
17
|
|
18 cd ..
|
|
19 hg clone A1 B1
|
|
20
|
|
21 cd A1
|
|
22 rm bar
|
|
23 hg remove bar
|
|
24 hg commit -t "commit test" -d "0 0" -u user
|
|
25
|
|
26 cd ../B1
|
|
27 echo This is file foo22 > foo
|
|
28 hg commit -t "commit test" -d "0 0" -u user
|
|
29
|
|
30 cd ..
|
|
31 hg clone A1 A2
|
|
32 hg clone B1 B2
|
|
33
|
|
34 cd A1
|
|
35 hg pull ../B1
|
|
36 hg update -m
|
|
37 hg commit -t "commit test" -d "0 0" -u user
|
|
38 echo bar should remain deleted.
|
|
39 hg manifest
|
|
40
|
|
41 cd ../B2
|
|
42 hg pull ../A2
|
|
43 hg update -m
|
|
44 hg commit -t "commit test" -d "0 0" -u user
|
|
45 echo bar should remain deleted.
|
|
46 hg manifest
|