view tests/test-remove @ 5483:0c43f87baba3 default tip

Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 27 Oct 2007 16:27:55 +0400
parents a6436e9333db
children
line wrap: on
line source

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