tests/test-issue612
author Brendan Cully <brendan@kublai.com>
Mon, 10 Sep 2007 15:00:05 -0700
changeset 5294 e14118f92730
parent 4820 9797124581c9
permissions -rwxr-xr-x
mq: fix regression in 6fd953d5faea It caused qrefresh; qrefresh -X addedfile to leave the file as normal in dirstate. It should be marked added on the second pass.

#!/bin/sh

mkdir t
cd t

hg init
mkdir src
echo a > src/a.c
hg ci -Ama -d "10000000 0"

hg mv src source
hg ci -Ammove -d "1000000 0"

hg co -C 0
echo new > src/a.c
echo compiled > src/a.o
hg ci -mupdate -d "1000000 0"

hg st

hg merge

hg st