Mercurial 0.5
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Mercurial 0.5
Update version numbers
Fixup MANIFEST.in
manifest hash: 58db9be35685e83133f20e96265d6c434fc106c2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCmOwHywK+sNU5EO8RAq0OAKCkMWzSMzhisTFBmT2WLj2bf+PMqwCbBv+S
jNvqIQsru2JMdCQC2eG7CxU=
=c20j
-----END PGP SIGNATURE-----
#!/bin/sh -x
set +e
BASE=foo.base
BR1=foo.br1
BR2=foo.br2
BR2_1=foo.br2_1
mkdir $BASE
cd $BASE
hg init
echo test > file
hg add file
EDITOR="echo 'initial commit' > " hg commit
cd ..
mkdir $BR1
cd $BR1
hg branch ../$BASE
hg checkout
echo test > file1
hg addremove
EDITOR="echo side commit >" hg commit
cd ..
mkdir $BR2
cd $BR2
hg branch ../$BASE
hg checkout
echo yet more >> file2
hg addremove
EDITOR="echo second update >" hg commit
cd ..
mkdir $BR2_1
cd $BR2_1
hg branch ../$BR2
hg checkout
EDITOR="echo commit merge >" hg merge ../$BR1
hg checkout