tests/test-issue612
author Steve Borho <steve@borho.org>
Tue, 18 Sep 2007 19:53:01 -0500
changeset 5469 b12432b1c2c7
parent 4820 9797124581c9
permissions -rwxr-xr-x
Allow explicit disabling of extensions If the first character of an extension path is '!', the extension is silently skipped.

#!/bin/sh

mkdir t
cd t

hg init
mkdir src
echo a > src/a.c
hg ci -Ama -d "10000000 0"

hg mv src source
hg ci -Ammove -d "1000000 0"

hg co -C 0
echo new > src/a.c
echo compiled > src/a.o
hg ci -mupdate -d "1000000 0"

hg st

hg merge

hg st