view tests/test-issue619 @ 8386:4aad982111b6

inotify: Abstract the layer format and sizes to a inotify.common dictionary Instead of having a single possible request format, introduce a dictionary of possible messages in inotify.common
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Thu, 14 May 2009 15:48:47 +0200
parents 8808ea7da86b
children 4c94b6d0fb1c
line wrap: on
line source

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