Some tweaking of notes.txt
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Some tweaking of notes.txt
manifest hash: c32913f139f35f28a87a4e432b5dd63deaab3c2b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCorsEywK+sNU5EO8RAph7AKCT8zmySShpwxUI9lNbe/Ctc0sZiwCgtAKG
TaNy7+0p62smfYecxxvBwS4=
=mLc6
-----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