test-merge6
46 lines
| 708 B
| text/plain
|
TextLexer
/ tests / test-merge6
|
r800 | #!/bin/sh | ||
|
r616 | |||
cat <<'EOF' > merge | ||||
#!/bin/sh | ||||
echo merging for `basename $1` | ||||
EOF | ||||
chmod +x merge | ||||
|
r800 | HGMERGE=./merge; export HGMERGE | ||
|
r616 | |||
mkdir A1 | ||||
cd A1 | ||||
hg init | ||||
echo This is file foo1 > foo | ||||
echo This is file bar1 > bar | ||||
hg add foo bar | ||||
|
r1933 | hg commit -m "commit text" -d "1000000 0" | ||
|
r616 | |||
cd .. | ||||
hg clone A1 B1 | ||||
cd A1 | ||||
rm bar | ||||
hg remove bar | ||||
|
r1933 | hg commit -m "commit test" -d "1000000 0" | ||
|
r616 | |||
cd ../B1 | ||||
echo This is file foo22 > foo | ||||
|
r1933 | hg commit -m "commit test" -d "1000000 0" | ||
|
r616 | |||
cd .. | ||||
hg clone A1 A2 | ||||
hg clone B1 B2 | ||||
cd A1 | ||||
hg pull ../B1 | ||||
|
r2283 | hg merge | ||
|
r1933 | hg commit -m "commit test" -d "1000000 0" | ||
|
r616 | echo bar should remain deleted. | ||
hg manifest | ||||
cd ../B2 | ||||
hg pull ../A2 | ||||
|
r2283 | hg merge | ||
|
r1933 | hg commit -m "commit test" -d "1000000 0" | ||
|
r616 | echo bar should remain deleted. | ||
hg manifest | ||||