view tests/test-copy-move-merge @ 5457:7372b6bbc5e6

osutil: improve portability - manually inline mode_to_kind - remove unused alloca include - remove fstatat and associated bits It's not obvious that there's an advantage to using fstatat in terms of performance. The race-avoidance properties of fstatat aren't terribly useful to us either. So best to avoid it until we figure out how to use it portably.
author Matt Mackall <mpm@selenic.com>
date Thu, 11 Oct 2007 17:46:06 -0500
parents 8d9bdcbb2b18
children
line wrap: on
line source

#!/bin/sh

mkdir t
cd t
hg init

echo 1 > a
hg ci -qAm "first" -d "1000000 0"

hg cp a b
hg mv a c
echo 2 >> b
echo 2 >> c

hg ci -qAm "second" -d "1000000 0"

hg co -C 0

echo 0 > a
echo 1 >> a

hg ci -qAm "other" -d "1000000 0"

hg merge --debug

echo "-- b --"
cat b

echo "-- c --"
cat c