view tests/test-add @ 7316:9737041646bc

bookmarks: Use dirstate to determine the current node in addchangegroup

Using the changectx might result in a lookup error during the strip command.
Thefore we use the current dirstate to get the parents of the working directory.

#!/bin/sh

hg init a
cd a
echo a > a
hg add -n
hg st
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 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