tests/test-conflict
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 21 Jun 2007 23:42:06 -0300
changeset 4677 de8ec7e1753a
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
dirstate.status: if a file is marked as copied, consider it modified After a "hg copy --force --after somefile cleanfile", cleanfile shouldn't be considered clean anymore.

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
hg merge 1
hg id
cat a
hg status