Bump the version number to 0.5b for the protocol change -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Bump the version number to 0.5b for the protocol change manifest hash: a7930fa15b716eb90613bd761b47c27331ea4b8b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCmz7pywK+sNU5EO8RAt7dAJ4qmUpDRS7/JP/JpLm8uXZ0c+5W/ACfVb0Q 99rjYslSjJfOWYLCKiAzVyU= =WVVg -----END PGP SIGNATURE-----

set -ex
export EDITOR=true
rm -rf test branch

mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit
hg verify
cd ..

cp -a test branch
cd branch
echo bar>>foo
hg commit

cd ../test
hg merge ../branch
hg verify