view tests/test-remove @ 2548:0229ff95faec

Clarified message when nothing to merge is seen. Sometimes there's a non-tip head waiting to be merged, especially after pulling in remote changes while there were local modifications in the working directory which had to be committed before 'hg merge' can work.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 03 Jul 2006 19:14:29 +0200
parents b2f37c7026ca
children 890e285c52a1
line wrap: on
line source

#!/bin/sh

hg init a
cd a
echo a > foo
hg rm foo
hg add foo
hg commit -m 1 -d "1000000 0"
hg remove
rm foo
hg remove foo
hg revert
rm foo
hg remove --after
hg commit -m 2 -d "1000000 0"
hg export 0
hg export 1
hg log -p -r 0
hg log -p -r 1

echo a > a
hg add a
hg rm a
hg rm -f a
echo b > b
hg ci -A -m 3 -d "1000001 0"
echo c >> b
hg rm b
hg rm -f b

cd ..
hg clone a b