view tests/test-issue619 @ 10930:230ab9a23594

wix updates

- using FileSource attribute
- removed unneeded "DiskId='1'"
- all guids are now in guids.wxi

#!/bin/sh

mkdir t
cd t
hg init
echo a > a
hg ci -Ama -d '1000000000 0'
echo b > b
hg branch b
hg ci -Amb -d '1000000000 0'
hg co -C 0

echo fast-forward
hg merge b
hg ci -Ammerge -d '1000000000 0'

echo bogus fast-forward should fail
hg merge b

echo done