view tests/test-conflict @ 7816:f420eafe59cd

bookmarks: Set current bookmark if we create a new one on the tip

If track.current is enabled we set the newly created bookmark as the
current tracked bookmark. We do not do this if a revision is specified.

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