tests/test-issue842
author Nicolas Dumazet <nicdumz.commits@gmail.com>
Fri, 11 Dec 2009 15:09:52 +0900
branchstable
changeset 10048 46de82e50790
parent 8452 cb93eee1fbcd
permissions -rwxr-xr-x
mq: qpop: remove added files before re-adding removed files We need to do this to avoid file/directories conflicts. This causes patches removing a committed file and replacing it with a directory to be "unpoppable".

#!/bin/sh

hg init test
cd test
echo foo > a
hg ci -Ama

hg up -r0000
echo bar > a
echo % should issue warning
hg ci -Amb

hg up -r0000
echo stuffy > a
echo % should not issue warning
hg ci -q -Amc

hg up -r0000
echo crap > a
hg branch testing
echo % should not issue warning
hg ci -q -Amd