annotate tests/test-add @ 8902:b9a8b616521d

Add a forget command for easily untracking files.

This command does exactly what 'hg remove -Af [FILES]' does.

The reason for creating a new command is that the options for 'hg remove'
are confusing (-A removes only deleted files, -f forces deletion, and using
both means *the exact opposite of both*).

[mpm: simplified help text, code, and updated tests]

#!/bin/sh

hg init a
cd a
echo a > a
hg add -n
hg st
hg add
hg st
hg forget a
hg add
hg st

echo b > b
hg add -n b
hg st
hg add b || echo "failed to add b"
hg st
echo % should fail
hg add b
hg st

hg ci -m 0
echo % should fail
hg add a

echo aa > a
hg ci -m 1
hg up 0
echo aaa > a
hg ci -m 2

hg merge
hg st
echo % should fail
hg add a
hg st
hg resolve -m a
hg ci -m merge

echo % issue683
hg forget a
hg add a
hg st
hg rm a
hg st
echo a > a
hg add a
hg st

hg add c && echo "unexpected addition of missing file"
echo c > c
hg add d c && echo "unexpected addition of missing file"
hg st