tests/test-conflict
author Jesse Glick <jesse.glick@sun.com>
Tue, 08 Jan 2008 22:40:51 -0500
changeset 5943 ffaf2419de44
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
Ensure that absolutized paths from hgrc do not contain ../ segments.

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