tests/test-copy-move-merge
author Nicolas Dumazet <nicdumz.commits@gmail.com>
Tue, 01 Dec 2009 09:53:02 +0900
changeset 10013 b2e87fde6806
parent 5059 8d9bdcbb2b18
permissions -rwxr-xr-x
run-tests: --inotify: use inotify.appendpid to append pids to $DAEMON_PIDS Introduce a inotify.appendpid configuration possibility that appends pids to inotify.pidfile when set to True.

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