tests/manifest-bug
author mpm@selenic.com
Wed, 01 Jun 2005 19:19:38 -0800
changeset 219 8ff4532376a4
parent 28 9f64ee817199
permissions -rw-r--r--
hg checkout: refuse to checkout if there are outstanding changes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg checkout: refuse to checkout if there are outstanding changes This is a stop-gap until I make the working dir logic smarter manifest hash: a3f6adcb7eecec294000039057d59771958f4186 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnnrKywK+sNU5EO8RAtqBAJwPQQrW5GhjMP9HMkFtfD7qhqxIcgCfXvA4 oXHO13uzBn5JOaTH3KwsMbQ= =IzTY -----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