test-filebranch
79 lines
| 1.4 KiB
| text/plain
|
TextLexer
/ tests / test-filebranch
|
r990 | #!/bin/sh | ||
# This test makes sure that we don't mark a file as merged with its ancestor | ||||
# when we do a merge. | ||||
cat <<'EOF' > merge | ||||
#!/bin/sh | ||||
echo merging for `basename $1` | ||||
EOF | ||||
chmod +x merge | ||||
echo creating base | ||||
hg init a | ||||
cd a | ||||
echo 1 > foo | ||||
echo 1 > bar | ||||
echo 1 > baz | ||||
echo 1 > quux | ||||
hg add foo bar baz quux | ||||
|
r1933 | hg commit -m "base" -d "1000000 0" | ||
|
r990 | |||
cd .. | ||||
hg clone a b | ||||
echo creating branch a | ||||
cd a | ||||
echo 2a > foo | ||||
echo 2a > bar | ||||
|
r1933 | hg commit -m "branch a" -d "1000000 0" | ||
|
r990 | |||
echo creating branch b | ||||
cd .. | ||||
cd b | ||||
echo 2b > foo | ||||
echo 2b > baz | ||||
|
r1933 | hg commit -m "branch b" -d "1000000 0" | ||
|
r990 | |||
echo "we shouldn't have anything but n state here" | ||||
hg debugstate | cut -b 1-16,35- | ||||
echo merging | ||||
hg pull ../a | ||||
|
r2283 | env HGMERGE=../merge hg merge -v | ||
|
r990 | |||
echo 2m > foo | ||||
echo 2b > baz | ||||
echo new > quux | ||||
echo "we shouldn't have anything but foo in merge state here" | ||||
hg debugstate | cut -b 1-16,35- | grep "^m" | ||||
|
r1933 | hg ci -m "merge" -d "1000000 0" | ||
|
r990 | |||
echo "main: we should have a merge here" | ||||
hg debugindex .hg/00changelog.i | ||||
|
r993 | echo "log should show foo and quux changed" | ||
hg log -v -r tip | ||||
|
r990 | echo "foo: we should have a merge here" | ||
hg debugindex .hg/data/foo.i | ||||
echo "bar: we shouldn't have a merge here" | ||||
hg debugindex .hg/data/bar.i | ||||
echo "baz: we shouldn't have a merge here" | ||||
hg debugindex .hg/data/baz.i | ||||
echo "quux: we shouldn't have a merge here" | ||||
hg debugindex .hg/data/quux.i | ||||
|
r993 | echo "manifest entries should match tips of all files" | ||
hg manifest | ||||
|
r990 | echo "everything should be clean now" | ||
hg status | ||||
hg verify | ||||