view tests/test-conflict @ 6920:7e5e13bee8f4

Make test-hardlinks-safety portable On some systems cp cannot create/preserve hardlinks. Use util.copyfiles instead, after making sure it actually does create hardlinks.
author Christian Ebert <blacktrash@gmx.net>
date Wed, 20 Aug 2008 17:58:12 +0200
parents 93a4e72b4f83
children
line wrap: on
line source

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