view tests/test-conflict @ 6033:a1ebd5cd7e55

dirstate.status: avoid putting ignored files in the unknown list

If list_ignored was false, we would blindly add files not in the
dirstate to the unknown list.

This should finish fixing issue886.

#!/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