view tests/test-merge8 @ 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

#!/bin/sh

# Test for changeset ba7c74081861
# (update dirstate correctly for non-branchmerge updates)
hg init a
cd a
echo a > a
hg add a
hg commit -m a
cd ..
hg clone a b
cd a
hg mv a b
hg commit -m move
echo b >> b
hg commit -m b
cd ../b
hg pull ../a
hg update