Mercurial > hg

view tests/test-merge6 @ 695:085a8145e151

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed tests. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fixed tests. manifest hash: f6f36e6f95ea99efccc84dfa1d0af63d414a0eba -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1hsCW7P1GVgWeRoRAtbyAJoDpbSygoutryu3P/miCpX2Q/LA8gCgiClo P+1ZpH0gycio/V4CKmj5Hlo= =JVBT -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 14 Jul 2005 08:57:54 +0100
parents d96c1153b25d
children 7e4843b7efd2
line wrap: on
line source

#!/bin/sh -x

cat <<'EOF' > merge
#!/bin/sh
echo merging for `basename $1`
EOF
chmod +x merge
export HGMERGE=./merge

mkdir A1
cd A1
hg init
echo This is file foo1 > foo
echo This is file bar1 > bar
hg add foo bar
hg commit -t "commit text" -d "0 0" -u user

cd ..
hg clone A1 B1

cd A1
rm bar
hg remove bar
hg commit -t "commit test" -d "0 0" -u user

cd ../B1
echo This is file foo22 > foo
hg commit -t "commit test" -d "0 0" -u user

cd ..
hg clone A1 A2
hg clone B1 B2

cd A1
hg pull ../B1
hg update -m
hg commit -t "commit test" -d "0 0" -u user
echo bar should remain deleted.
hg manifest

cd ../B2
hg pull ../A2
hg update -m
hg commit -t "commit test" -d "0 0" -u user
echo bar should remain deleted.
hg manifest