view tests/test-remove @ 6297:fed1a9c22076

dirstate.remove: during merges, remember the previous file state

We encode the previous state as a negative file size (AFAICS, previous
versions of hg always have size == 0 when state == 'r').

We save the state of 'm'erged and dirty files, because they're the
two states that indicate that a file has to be committed on a merge
to correctly record per-file history.

#!/bin/sh

hg init a
cd a
echo a > foo
hg rm foo
hg add foo
hg commit -m 1 -d "1000000 0"
hg remove
rm foo
hg remove foo
hg revert --all
rm foo
hg remove --after
hg commit -m 2 -d "1000000 0"
hg export --nodates 0
hg export --nodates 1
hg log -p -r 0
hg log -p -r 1

echo a > a
hg add a
hg rm a
hg rm -f a
echo b > b
mkdir c
echo d > c/d
hg ci -A -m 3 -d "1000001 0"
echo c >> b
hg rm b
hg rm -f b
hg rm -A c/d
hg st
cat c/d
hg revert c
hg rm -A
hg st
hg rm -A c
hg st
rm c/d
hg rm -A
hg st

cd ..
hg clone a b